author | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 06:53:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:59 (UTC) |
commit | 2273c2c821bfc77d492d7e97ae38f162d7fc91aa (patch) (unidiff) | |
tree | 688acf38d828122c86af88585cd89dbf23efc239 /cgit.c | |
parent | 007df98d2114fac4e9134cd7bc7e2960d0d730b4 (diff) | |
download | cgit-2273c2c821bfc77d492d7e97ae38f162d7fc91aa.zip cgit-2273c2c821bfc77d492d7e97ae38f162d7fc91aa.tar.gz cgit-2273c2c821bfc77d492d7e97ae38f162d7fc91aa.tar.bz2 |
Add config option 'enable-filter-overrides'
This option must be enabled if repo-specific cgitrc files should be
allowed to override any of the 'filter' options.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -65,19 +65,20 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
65 | else if (!strcmp(name, "module-link")) | 65 | else if (!strcmp(name, "module-link")) |
66 | repo->module_link= xstrdup(value); | 66 | repo->module_link= xstrdup(value); |
67 | else if (!strcmp(name, "section")) | 67 | else if (!strcmp(name, "section")) |
68 | repo->section = xstrdup(value); | 68 | repo->section = xstrdup(value); |
69 | else if (!strcmp(name, "about-filter")) | ||
70 | repo->about_filter = new_filter(value, 0); | ||
71 | else if (!strcmp(name, "commit-filter")) | ||
72 | repo->commit_filter = new_filter(value, 0); | ||
73 | else if (!strcmp(name, "source-filter")) | ||
74 | repo->source_filter = new_filter(value, 1); | ||
75 | else if (!strcmp(name, "readme") && value != NULL) { | 69 | else if (!strcmp(name, "readme") && value != NULL) { |
76 | if (*value == '/') | 70 | if (*value == '/') |
77 | ctx.repo->readme = xstrdup(value); | 71 | ctx.repo->readme = xstrdup(value); |
78 | else | 72 | else |
79 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 73 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
74 | } else if (ctx.cfg.enable_filter_overrides) { | ||
75 | if (!strcmp(name, "about-filter")) | ||
76 | repo->about_filter = new_filter(value, 0); | ||
77 | else if (!strcmp(name, "commit-filter")) | ||
78 | repo->commit_filter = new_filter(value, 0); | ||
79 | else if (!strcmp(name, "source-filter")) | ||
80 | repo->source_filter = new_filter(value, 1); | ||
80 | } | 81 | } |
81 | } | 82 | } |
82 | 83 | ||
83 | void config_cb(const char *name, const char *value) | 84 | void config_cb(const char *name, const char *value) |
@@ -127,8 +128,10 @@ void config_cb(const char *name, const char *value) | |||
127 | else if (!strcmp(name, "noheader")) | 128 | else if (!strcmp(name, "noheader")) |
128 | ctx.cfg.noheader = atoi(value); | 129 | ctx.cfg.noheader = atoi(value); |
129 | else if (!strcmp(name, "snapshots")) | 130 | else if (!strcmp(name, "snapshots")) |
130 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 131 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
132 | else if (!strcmp(name, "enable-filter-overrides")) | ||
133 | ctx.cfg.enable_filter_overrides = atoi(value); | ||
131 | else if (!strcmp(name, "enable-index-links")) | 134 | else if (!strcmp(name, "enable-index-links")) |
132 | ctx.cfg.enable_index_links = atoi(value); | 135 | ctx.cfg.enable_index_links = atoi(value); |
133 | else if (!strcmp(name, "enable-log-filecount")) | 136 | else if (!strcmp(name, "enable-log-filecount")) |
134 | ctx.cfg.enable_log_filecount = atoi(value); | 137 | ctx.cfg.enable_log_filecount = atoi(value); |