summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-09 11:39:44 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-09 11:39:44 (UTC)
commit97b3d252629a8a3b9d356c2532dec7611438e4b9 (patch) (unidiff)
treeaa8225159ce897830f12b3f2f73f4af12f0d4f8e
parente976df27952ca1e450c1c3d420532ac9f5e3036b (diff)
downloadcgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.zip
cgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.tar.gz
cgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.tar.bz2
cgit.c: allow repo.*-filter options to unset the current default
If e.g. repo.commit-filter is specified as an empty string, this is now properly handled as disabling the global commit-filter setting for the current repository. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index fd341b8..b3a98c1 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,216 +1,216 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cache.h" 10#include "cache.h"
11#include "cmd.h" 11#include "cmd.h"
12#include "configfile.h" 12#include "configfile.h"
13#include "html.h" 13#include "html.h"
14#include "ui-shared.h" 14#include "ui-shared.h"
15#include "ui-stats.h" 15#include "ui-stats.h"
16#include "scan-tree.h" 16#include "scan-tree.h"
17 17
18const char *cgit_version = CGIT_VERSION; 18const char *cgit_version = CGIT_VERSION;
19 19
20struct cgit_filter *new_filter(const char *cmd, int extra_args) 20struct cgit_filter *new_filter(const char *cmd, int extra_args)
21{ 21{
22 struct cgit_filter *f; 22 struct cgit_filter *f;
23 23
24 if (!cmd) 24 if (!cmd || !cmd[0])
25 return NULL; 25 return NULL;
26 26
27 f = xmalloc(sizeof(struct cgit_filter)); 27 f = xmalloc(sizeof(struct cgit_filter));
28 f->cmd = xstrdup(cmd); 28 f->cmd = xstrdup(cmd);
29 f->argv = xmalloc((2 + extra_args) * sizeof(char *)); 29 f->argv = xmalloc((2 + extra_args) * sizeof(char *));
30 f->argv[0] = f->cmd; 30 f->argv[0] = f->cmd;
31 f->argv[1] = NULL; 31 f->argv[1] = NULL;
32 return f; 32 return f;
33} 33}
34 34
35void config_cb(const char *name, const char *value) 35void config_cb(const char *name, const char *value)
36{ 36{
37 if (!strcmp(name, "root-title")) 37 if (!strcmp(name, "root-title"))
38 ctx.cfg.root_title = xstrdup(value); 38 ctx.cfg.root_title = xstrdup(value);
39 else if (!strcmp(name, "root-desc")) 39 else if (!strcmp(name, "root-desc"))
40 ctx.cfg.root_desc = xstrdup(value); 40 ctx.cfg.root_desc = xstrdup(value);
41 else if (!strcmp(name, "root-readme")) 41 else if (!strcmp(name, "root-readme"))
42 ctx.cfg.root_readme = xstrdup(value); 42 ctx.cfg.root_readme = xstrdup(value);
43 else if (!strcmp(name, "css")) 43 else if (!strcmp(name, "css"))
44 ctx.cfg.css = xstrdup(value); 44 ctx.cfg.css = xstrdup(value);
45 else if (!strcmp(name, "favicon")) 45 else if (!strcmp(name, "favicon"))
46 ctx.cfg.favicon = xstrdup(value); 46 ctx.cfg.favicon = xstrdup(value);
47 else if (!strcmp(name, "footer")) 47 else if (!strcmp(name, "footer"))
48 ctx.cfg.footer = xstrdup(value); 48 ctx.cfg.footer = xstrdup(value);
49 else if (!strcmp(name, "head-include")) 49 else if (!strcmp(name, "head-include"))
50 ctx.cfg.head_include = xstrdup(value); 50 ctx.cfg.head_include = xstrdup(value);
51 else if (!strcmp(name, "header")) 51 else if (!strcmp(name, "header"))
52 ctx.cfg.header = xstrdup(value); 52 ctx.cfg.header = xstrdup(value);
53 else if (!strcmp(name, "logo")) 53 else if (!strcmp(name, "logo"))
54 ctx.cfg.logo = xstrdup(value); 54 ctx.cfg.logo = xstrdup(value);
55 else if (!strcmp(name, "index-header")) 55 else if (!strcmp(name, "index-header"))
56 ctx.cfg.index_header = xstrdup(value); 56 ctx.cfg.index_header = xstrdup(value);
57 else if (!strcmp(name, "index-info")) 57 else if (!strcmp(name, "index-info"))
58 ctx.cfg.index_info = xstrdup(value); 58 ctx.cfg.index_info = xstrdup(value);
59 else if (!strcmp(name, "logo-link")) 59 else if (!strcmp(name, "logo-link"))
60 ctx.cfg.logo_link = xstrdup(value); 60 ctx.cfg.logo_link = xstrdup(value);
61 else if (!strcmp(name, "module-link")) 61 else if (!strcmp(name, "module-link"))
62 ctx.cfg.module_link = xstrdup(value); 62 ctx.cfg.module_link = xstrdup(value);
63 else if (!strcmp(name, "virtual-root")) { 63 else if (!strcmp(name, "virtual-root")) {
64 ctx.cfg.virtual_root = trim_end(value, '/'); 64 ctx.cfg.virtual_root = trim_end(value, '/');
65 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 65 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
66 ctx.cfg.virtual_root = ""; 66 ctx.cfg.virtual_root = "";
67 } else if (!strcmp(name, "nocache")) 67 } else if (!strcmp(name, "nocache"))
68 ctx.cfg.nocache = atoi(value); 68 ctx.cfg.nocache = atoi(value);
69 else if (!strcmp(name, "noheader")) 69 else if (!strcmp(name, "noheader"))
70 ctx.cfg.noheader = atoi(value); 70 ctx.cfg.noheader = atoi(value);
71 else if (!strcmp(name, "snapshots")) 71 else if (!strcmp(name, "snapshots"))
72 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 72 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
73 else if (!strcmp(name, "enable-index-links")) 73 else if (!strcmp(name, "enable-index-links"))
74 ctx.cfg.enable_index_links = atoi(value); 74 ctx.cfg.enable_index_links = atoi(value);
75 else if (!strcmp(name, "enable-log-filecount")) 75 else if (!strcmp(name, "enable-log-filecount"))
76 ctx.cfg.enable_log_filecount = atoi(value); 76 ctx.cfg.enable_log_filecount = atoi(value);
77 else if (!strcmp(name, "enable-log-linecount")) 77 else if (!strcmp(name, "enable-log-linecount"))
78 ctx.cfg.enable_log_linecount = atoi(value); 78 ctx.cfg.enable_log_linecount = atoi(value);
79 else if (!strcmp(name, "max-stats")) 79 else if (!strcmp(name, "max-stats"))
80 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 80 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
81 else if (!strcmp(name, "cache-size")) 81 else if (!strcmp(name, "cache-size"))
82 ctx.cfg.cache_size = atoi(value); 82 ctx.cfg.cache_size = atoi(value);
83 else if (!strcmp(name, "cache-root")) 83 else if (!strcmp(name, "cache-root"))
84 ctx.cfg.cache_root = xstrdup(value); 84 ctx.cfg.cache_root = xstrdup(value);
85 else if (!strcmp(name, "cache-root-ttl")) 85 else if (!strcmp(name, "cache-root-ttl"))
86 ctx.cfg.cache_root_ttl = atoi(value); 86 ctx.cfg.cache_root_ttl = atoi(value);
87 else if (!strcmp(name, "cache-repo-ttl")) 87 else if (!strcmp(name, "cache-repo-ttl"))
88 ctx.cfg.cache_repo_ttl = atoi(value); 88 ctx.cfg.cache_repo_ttl = atoi(value);
89 else if (!strcmp(name, "cache-static-ttl")) 89 else if (!strcmp(name, "cache-static-ttl"))
90 ctx.cfg.cache_static_ttl = atoi(value); 90 ctx.cfg.cache_static_ttl = atoi(value);
91 else if (!strcmp(name, "cache-dynamic-ttl")) 91 else if (!strcmp(name, "cache-dynamic-ttl"))
92 ctx.cfg.cache_dynamic_ttl = atoi(value); 92 ctx.cfg.cache_dynamic_ttl = atoi(value);
93 else if (!strcmp(name, "commit-filter")) 93 else if (!strcmp(name, "commit-filter"))
94 ctx.cfg.commit_filter = new_filter(value, 0); 94 ctx.cfg.commit_filter = new_filter(value, 0);
95 else if (!strcmp(name, "embedded")) 95 else if (!strcmp(name, "embedded"))
96 ctx.cfg.embedded = atoi(value); 96 ctx.cfg.embedded = atoi(value);
97 else if (!strcmp(name, "max-message-length")) 97 else if (!strcmp(name, "max-message-length"))
98 ctx.cfg.max_msg_len = atoi(value); 98 ctx.cfg.max_msg_len = atoi(value);
99 else if (!strcmp(name, "max-repodesc-length")) 99 else if (!strcmp(name, "max-repodesc-length"))
100 ctx.cfg.max_repodesc_len = atoi(value); 100 ctx.cfg.max_repodesc_len = atoi(value);
101 else if (!strcmp(name, "max-repo-count")) 101 else if (!strcmp(name, "max-repo-count"))
102 ctx.cfg.max_repo_count = atoi(value); 102 ctx.cfg.max_repo_count = atoi(value);
103 else if (!strcmp(name, "max-commit-count")) 103 else if (!strcmp(name, "max-commit-count"))
104 ctx.cfg.max_commit_count = atoi(value); 104 ctx.cfg.max_commit_count = atoi(value);
105 else if (!strcmp(name, "source-filter")) 105 else if (!strcmp(name, "source-filter"))
106 ctx.cfg.source_filter = new_filter(value, 1); 106 ctx.cfg.source_filter = new_filter(value, 1);
107 else if (!strcmp(name, "summary-log")) 107 else if (!strcmp(name, "summary-log"))
108 ctx.cfg.summary_log = atoi(value); 108 ctx.cfg.summary_log = atoi(value);
109 else if (!strcmp(name, "summary-branches")) 109 else if (!strcmp(name, "summary-branches"))
110 ctx.cfg.summary_branches = atoi(value); 110 ctx.cfg.summary_branches = atoi(value);
111 else if (!strcmp(name, "summary-tags")) 111 else if (!strcmp(name, "summary-tags"))
112 ctx.cfg.summary_tags = atoi(value); 112 ctx.cfg.summary_tags = atoi(value);
113 else if (!strcmp(name, "agefile")) 113 else if (!strcmp(name, "agefile"))
114 ctx.cfg.agefile = xstrdup(value); 114 ctx.cfg.agefile = xstrdup(value);
115 else if (!strcmp(name, "renamelimit")) 115 else if (!strcmp(name, "renamelimit"))
116 ctx.cfg.renamelimit = atoi(value); 116 ctx.cfg.renamelimit = atoi(value);
117 else if (!strcmp(name, "robots")) 117 else if (!strcmp(name, "robots"))
118 ctx.cfg.robots = xstrdup(value); 118 ctx.cfg.robots = xstrdup(value);
119 else if (!strcmp(name, "clone-prefix")) 119 else if (!strcmp(name, "clone-prefix"))
120 ctx.cfg.clone_prefix = xstrdup(value); 120 ctx.cfg.clone_prefix = xstrdup(value);
121 else if (!strcmp(name, "local-time")) 121 else if (!strcmp(name, "local-time"))
122 ctx.cfg.local_time = atoi(value); 122 ctx.cfg.local_time = atoi(value);
123 else if (!strcmp(name, "repo.group")) 123 else if (!strcmp(name, "repo.group"))
124 ctx.cfg.repo_group = xstrdup(value); 124 ctx.cfg.repo_group = xstrdup(value);
125 else if (!strcmp(name, "repo.url")) 125 else if (!strcmp(name, "repo.url"))
126 ctx.repo = cgit_add_repo(value); 126 ctx.repo = cgit_add_repo(value);
127 else if (!strcmp(name, "repo.name")) 127 else if (!strcmp(name, "repo.name"))
128 ctx.repo->name = xstrdup(value); 128 ctx.repo->name = xstrdup(value);
129 else if (ctx.repo && !strcmp(name, "repo.path")) 129 else if (ctx.repo && !strcmp(name, "repo.path"))
130 ctx.repo->path = trim_end(value, '/'); 130 ctx.repo->path = trim_end(value, '/');
131 else if (ctx.repo && !strcmp(name, "repo.clone-url")) 131 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
132 ctx.repo->clone_url = xstrdup(value); 132 ctx.repo->clone_url = xstrdup(value);
133 else if (ctx.repo && !strcmp(name, "repo.desc")) 133 else if (ctx.repo && !strcmp(name, "repo.desc"))
134 ctx.repo->desc = xstrdup(value); 134 ctx.repo->desc = xstrdup(value);
135 else if (ctx.repo && !strcmp(name, "repo.owner")) 135 else if (ctx.repo && !strcmp(name, "repo.owner"))
136 ctx.repo->owner = xstrdup(value); 136 ctx.repo->owner = xstrdup(value);
137 else if (ctx.repo && !strcmp(name, "repo.defbranch")) 137 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
138 ctx.repo->defbranch = xstrdup(value); 138 ctx.repo->defbranch = xstrdup(value);
139 else if (ctx.repo && !strcmp(name, "repo.snapshots")) 139 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
140 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 140 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
141 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) 141 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
142 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 142 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
143 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 143 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
144 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 144 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
145 else if (ctx.repo && !strcmp(name, "repo.max-stats")) 145 else if (ctx.repo && !strcmp(name, "repo.max-stats"))
146 ctx.repo->max_stats = cgit_find_stats_period(value, NULL); 146 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
147 else if (ctx.repo && !strcmp(name, "repo.module-link")) 147 else if (ctx.repo && !strcmp(name, "repo.module-link"))
148 ctx.repo->module_link= xstrdup(value); 148 ctx.repo->module_link= xstrdup(value);
149 else if (ctx.repo && !strcmp(name, "repo.commit-filter")) 149 else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
150 ctx.repo->commit_filter = new_filter(value, 0); 150 ctx.repo->commit_filter = new_filter(value, 0);
151 else if (ctx.repo && !strcmp(name, "repo.source-filter")) 151 else if (ctx.repo && !strcmp(name, "repo.source-filter"))
152 ctx.repo->source_filter = new_filter(value, 1); 152 ctx.repo->source_filter = new_filter(value, 1);
153 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 153 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
154 if (*value == '/') 154 if (*value == '/')
155 ctx.repo->readme = xstrdup(value); 155 ctx.repo->readme = xstrdup(value);
156 else 156 else
157 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 157 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
158 } else if (!strcmp(name, "include")) 158 } else if (!strcmp(name, "include"))
159 parse_configfile(value, config_cb); 159 parse_configfile(value, config_cb);
160} 160}
161 161
162static void querystring_cb(const char *name, const char *value) 162static void querystring_cb(const char *name, const char *value)
163{ 163{
164 if (!strcmp(name,"r")) { 164 if (!strcmp(name,"r")) {
165 ctx.qry.repo = xstrdup(value); 165 ctx.qry.repo = xstrdup(value);
166 ctx.repo = cgit_get_repoinfo(value); 166 ctx.repo = cgit_get_repoinfo(value);
167 } else if (!strcmp(name, "p")) { 167 } else if (!strcmp(name, "p")) {
168 ctx.qry.page = xstrdup(value); 168 ctx.qry.page = xstrdup(value);
169 } else if (!strcmp(name, "url")) { 169 } else if (!strcmp(name, "url")) {
170 ctx.qry.url = xstrdup(value); 170 ctx.qry.url = xstrdup(value);
171 cgit_parse_url(value); 171 cgit_parse_url(value);
172 } else if (!strcmp(name, "qt")) { 172 } else if (!strcmp(name, "qt")) {
173 ctx.qry.grep = xstrdup(value); 173 ctx.qry.grep = xstrdup(value);
174 } else if (!strcmp(name, "q")) { 174 } else if (!strcmp(name, "q")) {
175 ctx.qry.search = xstrdup(value); 175 ctx.qry.search = xstrdup(value);
176 } else if (!strcmp(name, "h")) { 176 } else if (!strcmp(name, "h")) {
177 ctx.qry.head = xstrdup(value); 177 ctx.qry.head = xstrdup(value);
178 ctx.qry.has_symref = 1; 178 ctx.qry.has_symref = 1;
179 } else if (!strcmp(name, "id")) { 179 } else if (!strcmp(name, "id")) {
180 ctx.qry.sha1 = xstrdup(value); 180 ctx.qry.sha1 = xstrdup(value);
181 ctx.qry.has_sha1 = 1; 181 ctx.qry.has_sha1 = 1;
182 } else if (!strcmp(name, "id2")) { 182 } else if (!strcmp(name, "id2")) {
183 ctx.qry.sha2 = xstrdup(value); 183 ctx.qry.sha2 = xstrdup(value);
184 ctx.qry.has_sha1 = 1; 184 ctx.qry.has_sha1 = 1;
185 } else if (!strcmp(name, "ofs")) { 185 } else if (!strcmp(name, "ofs")) {
186 ctx.qry.ofs = atoi(value); 186 ctx.qry.ofs = atoi(value);
187 } else if (!strcmp(name, "path")) { 187 } else if (!strcmp(name, "path")) {
188 ctx.qry.path = trim_end(value, '/'); 188 ctx.qry.path = trim_end(value, '/');
189 } else if (!strcmp(name, "name")) { 189 } else if (!strcmp(name, "name")) {
190 ctx.qry.name = xstrdup(value); 190 ctx.qry.name = xstrdup(value);
191 } else if (!strcmp(name, "mimetype")) { 191 } else if (!strcmp(name, "mimetype")) {
192 ctx.qry.mimetype = xstrdup(value); 192 ctx.qry.mimetype = xstrdup(value);
193 } else if (!strcmp(name, "s")){ 193 } else if (!strcmp(name, "s")){
194 ctx.qry.sort = xstrdup(value); 194 ctx.qry.sort = xstrdup(value);
195 } else if (!strcmp(name, "showmsg")) { 195 } else if (!strcmp(name, "showmsg")) {
196 ctx.qry.showmsg = atoi(value); 196 ctx.qry.showmsg = atoi(value);
197 } else if (!strcmp(name, "period")) { 197 } else if (!strcmp(name, "period")) {
198 ctx.qry.period = xstrdup(value); 198 ctx.qry.period = xstrdup(value);
199 } 199 }
200} 200}
201 201
202static void prepare_context(struct cgit_context *ctx) 202static void prepare_context(struct cgit_context *ctx)
203{ 203{
204 memset(ctx, 0, sizeof(ctx)); 204 memset(ctx, 0, sizeof(ctx));
205 ctx->cfg.agefile = "info/web/last-modified"; 205 ctx->cfg.agefile = "info/web/last-modified";
206 ctx->cfg.nocache = 0; 206 ctx->cfg.nocache = 0;
207 ctx->cfg.cache_size = 0; 207 ctx->cfg.cache_size = 0;
208 ctx->cfg.cache_dynamic_ttl = 5; 208 ctx->cfg.cache_dynamic_ttl = 5;
209 ctx->cfg.cache_max_create_time = 5; 209 ctx->cfg.cache_max_create_time = 5;
210 ctx->cfg.cache_repo_ttl = 5; 210 ctx->cfg.cache_repo_ttl = 5;
211 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 211 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
212 ctx->cfg.cache_root_ttl = 5; 212 ctx->cfg.cache_root_ttl = 5;
213 ctx->cfg.cache_static_ttl = -1; 213 ctx->cfg.cache_static_ttl = -1;
214 ctx->cfg.css = "/cgit.css"; 214 ctx->cfg.css = "/cgit.css";
215 ctx->cfg.logo = "/git-logo.png"; 215 ctx->cfg.logo = "/git-logo.png";
216 ctx->cfg.local_time = 0; 216 ctx->cfg.local_time = 0;