cgit_open_filter: also take the repo as a parameter

To prepare for handing repo configuration to the
filter script that is executed.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.h b/cgit.h
index 1f8b1bee11c77bfeaea22b5d9758e03731c951d9..3b0eaf5c2bb1fe6f68955ab7168303ae533ca6fa 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -318,7 +318,7 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
-extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo);
 extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);

diff --git a/shared.c b/shared.c
index 7ec2e19296e2bfbc7226849163b8bdb05bb56e94..e4879df3d2b17706c75084f696b8f6b5e69f1402 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -376,7 +376,7 @@ int cgit_parse_snapshots_mask(const char *str)
        return rv;
 }
 
-int cgit_open_filter(struct cgit_filter *filter)
+int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),

diff --git a/ui-commit.c b/ui-commit.c
index 2b4f677832e2aa0e85e305f3ee5ada1f7de07e2c..2da9fcf2b356f6ebabe49d814311406b587f8154 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        html("</table>\n");
        html("<div class='commit-subject'>");
        if (ctx.repo->commit_filter)
-               cgit_open_filter(ctx.repo->commit_filter);
+               cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
        html_txt(info->subject);
        if (ctx.repo->commit_filter)
                cgit_close_filter(ctx.repo->commit_filter);
@@ -118,7 +118,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        html("</div>");
        html("<div class='commit-msg'>");
        if (ctx.repo->commit_filter)
-               cgit_open_filter(ctx.repo->commit_filter);
+               cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
        html_txt(info->msg);
        if (ctx.repo->commit_filter)
                cgit_close_filter(ctx.repo->commit_filter);
@@ -127,7 +127,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                html("<div class='notes-header'>Notes</div>");
                html("<div class='notes'>");
                if (ctx.repo->commit_filter)
-                       cgit_open_filter(ctx.repo->commit_filter);
+                       cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
                html_txt(notes.buf);
                if (ctx.repo->commit_filter)
                        cgit_close_filter(ctx.repo->commit_filter);

diff --git a/ui-repolist.c b/ui-repolist.c
index 2c98668ad931489ad54632d3c869c06de294f1cb..05b4548fab2f0a4de2230e5f46ece7c90588a91f 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -291,7 +291,7 @@ void cgit_print_site_readme()
        if (!ctx.cfg.root_readme)
                return;
        if (ctx.cfg.about_filter)
-               cgit_open_filter(ctx.cfg.about_filter);
+               cgit_open_filter(ctx.cfg.about_filter, NULL);
        html_include(ctx.cfg.root_readme);
        if (ctx.cfg.about_filter)
                cgit_close_filter(ctx.cfg.about_filter);

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6e3412c9e3a6b3175475e0b7a0b4c5433850f612..067082c30c225ef445acc8c226881436e2cb736e 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -19,7 +19,7 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f
        f.argv = malloc(2 * sizeof(char *));
        f.argv[0] = f.cmd;
        f.argv[1] = NULL;
-       cgit_open_filter(&f);
+       cgit_open_filter(&f, NULL);
        rv = write_tar_archive(args);
        cgit_close_filter(&f);
        return rv;

diff --git a/ui-summary.c b/ui-summary.c
index 5be2545c398ca7f7ac715991e58b90b52f32e636..1e9a1b6daec6120c46148752b5afc8ec18e41691 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -113,7 +113,7 @@ void cgit_print_repo_readme(char *path)
         */
        html("<div id='summary'>");
        if (ctx.repo->about_filter)
-               cgit_open_filter(ctx.repo->about_filter);
+               cgit_open_filter(ctx.repo->about_filter, ctx.repo);
        if (ref)
                cgit_print_file(tmp, ref);
        else

diff --git a/ui-tree.c b/ui-tree.c
index 0b1b531494c4f24c059d4b80cf7d6faaf8612d0d..835c166317093ed0d6c1eee7b35a3c8b3d8a5b18 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -45,7 +45,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
        if (ctx.repo->source_filter) {
                html("<td class='lines'><pre><code>");
                ctx.repo->source_filter->argv[1] = xstrdup(name);
-               cgit_open_filter(ctx.repo->source_filter);
+               cgit_open_filter(ctx.repo->source_filter, ctx.repo);
                html_raw(buf, size);
                cgit_close_filter(ctx.repo->source_filter);
                html("</code></pre></td></tr></table>\n");