summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c4
-rw-r--r--cgit.h20
-rw-r--r--cgitrc.5.txt6
-rw-r--r--shared.c2
-rw-r--r--ui-commit.c16
-rw-r--r--ui-tree.c8
6 files changed, 35 insertions, 21 deletions
diff --git a/cgit.c b/cgit.c
index 2cda554..fd341b8 100644
--- a/cgit.c
+++ b/cgit.c
@@ -148,2 +148,6 @@ void config_cb(const char *name, const char *value)
ctx.repo->module_link= xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
+ ctx.repo->commit_filter = new_filter(value, 0);
+ else if (ctx.repo && !strcmp(name, "repo.source-filter"))
+ ctx.repo->source_filter = new_filter(value, 1);
else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
diff --git a/cgit.h b/cgit.h
index 438301d..f10ba05 100644
--- a/cgit.h
+++ b/cgit.h
@@ -50,2 +50,11 @@ typedef void (*linediff_fn)(char *line, int len);
+struct cgit_filter {
+ char *cmd;
+ char **argv;
+ int old_stdout;
+ int pipe_fh[2];
+ int pid;
+ int exitstatus;
+};
+
struct cgit_repo {
@@ -66,2 +75,4 @@ struct cgit_repo {
time_t mtime;
+ struct cgit_filter *commit_filter;
+ struct cgit_filter *source_filter;
};
@@ -131,11 +142,2 @@ struct cgit_query {
-struct cgit_filter {
- char *cmd;
- char **argv;
- int old_stdout;
- int pipe_fh[2];
- int pid;
- int exitstatus;
-};
-
struct cgit_config {
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 2efd6aa..ffb3e0f 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -240,2 +240,5 @@ repo.clone-url::
+repo.commit-filter::
+ Override the default commit-filter. Default value: <commit-filter>.
+
repo.defbranch::
@@ -280,2 +283,5 @@ repo.snapshots::
+repo.source-filter::
+ Override the default source-filter. Default value: <source-filter>.
+
repo.url::
diff --git a/shared.c b/shared.c
index 288cfa2..783604b 100644
--- a/shared.c
+++ b/shared.c
@@ -64,2 +64,4 @@ struct cgit_repo *cgit_add_repo(const char *url)
ret->mtime = -1;
+ ret->commit_filter = ctx.cfg.commit_filter;
+ ret->source_filter = ctx.cfg.source_filter;
return ret;
diff --git a/ui-commit.c b/ui-commit.c
index ee0e139..5815b58 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -91,7 +91,7 @@ void cgit_print_commit(char *hex)
html("<div class='commit-subject'>");
- if (ctx.cfg.commit_filter)
- cgit_open_filter(ctx.cfg.commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_open_filter(ctx.repo->commit_filter);
html_txt(info->subject);
- if (ctx.cfg.commit_filter)
- cgit_close_filter(ctx.cfg.commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_close_filter(ctx.repo->commit_filter);
show_commit_decorations(commit);
@@ -99,7 +99,7 @@ void cgit_print_commit(char *hex)
html("<div class='commit-msg'>");
- if (ctx.cfg.commit_filter)
- cgit_open_filter(ctx.cfg.commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_open_filter(ctx.repo->commit_filter);
html_txt(info->msg);
- if (ctx.cfg.commit_filter)
- cgit_close_filter(ctx.cfg.commit_filter);
+ if (ctx.repo->commit_filter)
+ cgit_close_filter(ctx.repo->commit_filter);
html("</div>");
diff --git a/ui-tree.c b/ui-tree.c
index 816e121..caf6a9e 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -24,8 +24,8 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
html("<table summary='blob content' class='blob'>\n");
- if (ctx.cfg.source_filter) {
+ if (ctx.repo->source_filter) {
html("<tr><td class='lines'><pre><code>");
- ctx.cfg.source_filter->argv[1] = xstrdup(name);
- cgit_open_filter(ctx.cfg.source_filter);
+ ctx.repo->source_filter->argv[1] = xstrdup(name);
+ cgit_open_filter(ctx.repo->source_filter);
write(STDOUT_FILENO, buf, size);
- cgit_close_filter(ctx.cfg.source_filter);
+ cgit_close_filter(ctx.repo->source_filter);
html("</code></pre></td></tr></table>\n");