author | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 08:17:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 08:17:23 (UTC) |
commit | cb92d05b6b729cd0e219b43d7a79aff832a9c1ac (patch) (unidiff) | |
tree | 3324266f779b12bcf9f80ad5ee2f18f535832549 /cgit.c | |
parent | 0730ee6ea4af45e29e7c74d4a32bde9d2d6c8104 (diff) | |
parent | 435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff) | |
download | cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.zip cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.gz cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -84,192 +84,195 @@ void config_cb(const char *name, const char *value) | |||
84 | ctx.cfg.enable_index_links = atoi(value); | 84 | ctx.cfg.enable_index_links = atoi(value); |
85 | else if (!strcmp(name, "enable-log-filecount")) | 85 | else if (!strcmp(name, "enable-log-filecount")) |
86 | ctx.cfg.enable_log_filecount = atoi(value); | 86 | ctx.cfg.enable_log_filecount = atoi(value); |
87 | else if (!strcmp(name, "enable-log-linecount")) | 87 | else if (!strcmp(name, "enable-log-linecount")) |
88 | ctx.cfg.enable_log_linecount = atoi(value); | 88 | ctx.cfg.enable_log_linecount = atoi(value); |
89 | else if (!strcmp(name, "max-stats")) | 89 | else if (!strcmp(name, "max-stats")) |
90 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 90 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
91 | else if (!strcmp(name, "cache-size")) | 91 | else if (!strcmp(name, "cache-size")) |
92 | ctx.cfg.cache_size = atoi(value); | 92 | ctx.cfg.cache_size = atoi(value); |
93 | else if (!strcmp(name, "cache-root")) | 93 | else if (!strcmp(name, "cache-root")) |
94 | ctx.cfg.cache_root = xstrdup(value); | 94 | ctx.cfg.cache_root = xstrdup(value); |
95 | else if (!strcmp(name, "cache-root-ttl")) | 95 | else if (!strcmp(name, "cache-root-ttl")) |
96 | ctx.cfg.cache_root_ttl = atoi(value); | 96 | ctx.cfg.cache_root_ttl = atoi(value); |
97 | else if (!strcmp(name, "cache-repo-ttl")) | 97 | else if (!strcmp(name, "cache-repo-ttl")) |
98 | ctx.cfg.cache_repo_ttl = atoi(value); | 98 | ctx.cfg.cache_repo_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-static-ttl")) | 99 | else if (!strcmp(name, "cache-static-ttl")) |
100 | ctx.cfg.cache_static_ttl = atoi(value); | 100 | ctx.cfg.cache_static_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-dynamic-ttl")) | 101 | else if (!strcmp(name, "cache-dynamic-ttl")) |
102 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 102 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
103 | else if (!strcmp(name, "about-filter")) | 103 | else if (!strcmp(name, "about-filter")) |
104 | ctx.cfg.about_filter = new_filter(value, 0); | 104 | ctx.cfg.about_filter = new_filter(value, 0); |
105 | else if (!strcmp(name, "commit-filter")) | 105 | else if (!strcmp(name, "commit-filter")) |
106 | ctx.cfg.commit_filter = new_filter(value, 0); | 106 | ctx.cfg.commit_filter = new_filter(value, 0); |
107 | else if (!strcmp(name, "embedded")) | 107 | else if (!strcmp(name, "embedded")) |
108 | ctx.cfg.embedded = atoi(value); | 108 | ctx.cfg.embedded = atoi(value); |
109 | else if (!strcmp(name, "max-message-length")) | 109 | else if (!strcmp(name, "max-message-length")) |
110 | ctx.cfg.max_msg_len = atoi(value); | 110 | ctx.cfg.max_msg_len = atoi(value); |
111 | else if (!strcmp(name, "max-repodesc-length")) | 111 | else if (!strcmp(name, "max-repodesc-length")) |
112 | ctx.cfg.max_repodesc_len = atoi(value); | 112 | ctx.cfg.max_repodesc_len = atoi(value); |
113 | else if (!strcmp(name, "max-repo-count")) | 113 | else if (!strcmp(name, "max-repo-count")) |
114 | ctx.cfg.max_repo_count = atoi(value); | 114 | ctx.cfg.max_repo_count = atoi(value); |
115 | else if (!strcmp(name, "max-commit-count")) | 115 | else if (!strcmp(name, "max-commit-count")) |
116 | ctx.cfg.max_commit_count = atoi(value); | 116 | ctx.cfg.max_commit_count = atoi(value); |
117 | else if (!strcmp(name, "source-filter")) | 117 | else if (!strcmp(name, "source-filter")) |
118 | ctx.cfg.source_filter = new_filter(value, 1); | 118 | ctx.cfg.source_filter = new_filter(value, 1); |
119 | else if (!strcmp(name, "summary-log")) | 119 | else if (!strcmp(name, "summary-log")) |
120 | ctx.cfg.summary_log = atoi(value); | 120 | ctx.cfg.summary_log = atoi(value); |
121 | else if (!strcmp(name, "summary-branches")) | 121 | else if (!strcmp(name, "summary-branches")) |
122 | ctx.cfg.summary_branches = atoi(value); | 122 | ctx.cfg.summary_branches = atoi(value); |
123 | else if (!strcmp(name, "summary-tags")) | 123 | else if (!strcmp(name, "summary-tags")) |
124 | ctx.cfg.summary_tags = atoi(value); | 124 | ctx.cfg.summary_tags = atoi(value); |
125 | else if (!strcmp(name, "agefile")) | 125 | else if (!strcmp(name, "agefile")) |
126 | ctx.cfg.agefile = xstrdup(value); | 126 | ctx.cfg.agefile = xstrdup(value); |
127 | else if (!strcmp(name, "renamelimit")) | 127 | else if (!strcmp(name, "renamelimit")) |
128 | ctx.cfg.renamelimit = atoi(value); | 128 | ctx.cfg.renamelimit = atoi(value); |
129 | else if (!strcmp(name, "robots")) | 129 | else if (!strcmp(name, "robots")) |
130 | ctx.cfg.robots = xstrdup(value); | 130 | ctx.cfg.robots = xstrdup(value); |
131 | else if (!strcmp(name, "clone-prefix")) | 131 | else if (!strcmp(name, "clone-prefix")) |
132 | ctx.cfg.clone_prefix = xstrdup(value); | 132 | ctx.cfg.clone_prefix = xstrdup(value); |
133 | else if (!strcmp(name, "local-time")) | 133 | else if (!strcmp(name, "local-time")) |
134 | ctx.cfg.local_time = atoi(value); | 134 | ctx.cfg.local_time = atoi(value); |
135 | else if (!prefixcmp(name, "mimetype.")) | 135 | else if (!prefixcmp(name, "mimetype.")) |
136 | add_mimetype(name + 9, value); | 136 | add_mimetype(name + 9, value); |
137 | else if (!strcmp(name, "repo.group")) | 137 | else if (!strcmp(name, "repo.group")) |
138 | ctx.cfg.repo_group = xstrdup(value); | 138 | ctx.cfg.repo_group = xstrdup(value); |
139 | else if (!strcmp(name, "repo.url")) | 139 | else if (!strcmp(name, "repo.url")) |
140 | ctx.repo = cgit_add_repo(value); | 140 | ctx.repo = cgit_add_repo(value); |
141 | else if (!strcmp(name, "repo.name")) | 141 | else if (!strcmp(name, "repo.name")) |
142 | ctx.repo->name = xstrdup(value); | 142 | ctx.repo->name = xstrdup(value); |
143 | else if (ctx.repo && !strcmp(name, "repo.path")) | 143 | else if (ctx.repo && !strcmp(name, "repo.path")) |
144 | ctx.repo->path = trim_end(value, '/'); | 144 | ctx.repo->path = trim_end(value, '/'); |
145 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 145 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
146 | ctx.repo->clone_url = xstrdup(value); | 146 | ctx.repo->clone_url = xstrdup(value); |
147 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 147 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
148 | ctx.repo->desc = xstrdup(value); | 148 | ctx.repo->desc = xstrdup(value); |
149 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 149 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
150 | ctx.repo->owner = xstrdup(value); | 150 | ctx.repo->owner = xstrdup(value); |
151 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 151 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
152 | ctx.repo->defbranch = xstrdup(value); | 152 | ctx.repo->defbranch = xstrdup(value); |
153 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 153 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
154 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 154 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
155 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 155 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
162 | ctx.repo->module_link= xstrdup(value); | 162 | ctx.repo->module_link= xstrdup(value); |
163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | 163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
164 | ctx.repo->about_filter = new_filter(value, 0); | 164 | ctx.repo->about_filter = new_filter(value, 0); |
165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
166 | ctx.repo->commit_filter = new_filter(value, 0); | 166 | ctx.repo->commit_filter = new_filter(value, 0); |
167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
168 | ctx.repo->source_filter = new_filter(value, 1); | 168 | ctx.repo->source_filter = new_filter(value, 1); |
169 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 169 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
170 | if (*value == '/') | 170 | if (*value == '/') |
171 | ctx.repo->readme = xstrdup(value); | 171 | ctx.repo->readme = xstrdup(value); |
172 | else | 172 | else |
173 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 173 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
174 | } else if (!strcmp(name, "include")) | 174 | } else if (!strcmp(name, "include")) |
175 | parse_configfile(value, config_cb); | 175 | parse_configfile(value, config_cb); |
176 | } | 176 | } |
177 | 177 | ||
178 | static void querystring_cb(const char *name, const char *value) | 178 | static void querystring_cb(const char *name, const char *value) |
179 | { | 179 | { |
180 | if (!value) | ||
181 | value = ""; | ||
182 | |||
180 | if (!strcmp(name,"r")) { | 183 | if (!strcmp(name,"r")) { |
181 | ctx.qry.repo = xstrdup(value); | 184 | ctx.qry.repo = xstrdup(value); |
182 | ctx.repo = cgit_get_repoinfo(value); | 185 | ctx.repo = cgit_get_repoinfo(value); |
183 | } else if (!strcmp(name, "p")) { | 186 | } else if (!strcmp(name, "p")) { |
184 | ctx.qry.page = xstrdup(value); | 187 | ctx.qry.page = xstrdup(value); |
185 | } else if (!strcmp(name, "url")) { | 188 | } else if (!strcmp(name, "url")) { |
186 | ctx.qry.url = xstrdup(value); | 189 | ctx.qry.url = xstrdup(value); |
187 | cgit_parse_url(value); | 190 | cgit_parse_url(value); |
188 | } else if (!strcmp(name, "qt")) { | 191 | } else if (!strcmp(name, "qt")) { |
189 | ctx.qry.grep = xstrdup(value); | 192 | ctx.qry.grep = xstrdup(value); |
190 | } else if (!strcmp(name, "q")) { | 193 | } else if (!strcmp(name, "q")) { |
191 | ctx.qry.search = xstrdup(value); | 194 | ctx.qry.search = xstrdup(value); |
192 | } else if (!strcmp(name, "h")) { | 195 | } else if (!strcmp(name, "h")) { |
193 | ctx.qry.head = xstrdup(value); | 196 | ctx.qry.head = xstrdup(value); |
194 | ctx.qry.has_symref = 1; | 197 | ctx.qry.has_symref = 1; |
195 | } else if (!strcmp(name, "id")) { | 198 | } else if (!strcmp(name, "id")) { |
196 | ctx.qry.sha1 = xstrdup(value); | 199 | ctx.qry.sha1 = xstrdup(value); |
197 | ctx.qry.has_sha1 = 1; | 200 | ctx.qry.has_sha1 = 1; |
198 | } else if (!strcmp(name, "id2")) { | 201 | } else if (!strcmp(name, "id2")) { |
199 | ctx.qry.sha2 = xstrdup(value); | 202 | ctx.qry.sha2 = xstrdup(value); |
200 | ctx.qry.has_sha1 = 1; | 203 | ctx.qry.has_sha1 = 1; |
201 | } else if (!strcmp(name, "ofs")) { | 204 | } else if (!strcmp(name, "ofs")) { |
202 | ctx.qry.ofs = atoi(value); | 205 | ctx.qry.ofs = atoi(value); |
203 | } else if (!strcmp(name, "path")) { | 206 | } else if (!strcmp(name, "path")) { |
204 | ctx.qry.path = trim_end(value, '/'); | 207 | ctx.qry.path = trim_end(value, '/'); |
205 | } else if (!strcmp(name, "name")) { | 208 | } else if (!strcmp(name, "name")) { |
206 | ctx.qry.name = xstrdup(value); | 209 | ctx.qry.name = xstrdup(value); |
207 | } else if (!strcmp(name, "mimetype")) { | 210 | } else if (!strcmp(name, "mimetype")) { |
208 | ctx.qry.mimetype = xstrdup(value); | 211 | ctx.qry.mimetype = xstrdup(value); |
209 | } else if (!strcmp(name, "s")){ | 212 | } else if (!strcmp(name, "s")){ |
210 | ctx.qry.sort = xstrdup(value); | 213 | ctx.qry.sort = xstrdup(value); |
211 | } else if (!strcmp(name, "showmsg")) { | 214 | } else if (!strcmp(name, "showmsg")) { |
212 | ctx.qry.showmsg = atoi(value); | 215 | ctx.qry.showmsg = atoi(value); |
213 | } else if (!strcmp(name, "period")) { | 216 | } else if (!strcmp(name, "period")) { |
214 | ctx.qry.period = xstrdup(value); | 217 | ctx.qry.period = xstrdup(value); |
215 | } | 218 | } |
216 | } | 219 | } |
217 | 220 | ||
218 | char *xstrdupn(const char *str) | 221 | char *xstrdupn(const char *str) |
219 | { | 222 | { |
220 | return (str ? xstrdup(str) : NULL); | 223 | return (str ? xstrdup(str) : NULL); |
221 | } | 224 | } |
222 | 225 | ||
223 | static void prepare_context(struct cgit_context *ctx) | 226 | static void prepare_context(struct cgit_context *ctx) |
224 | { | 227 | { |
225 | memset(ctx, 0, sizeof(ctx)); | 228 | memset(ctx, 0, sizeof(ctx)); |
226 | ctx->cfg.agefile = "info/web/last-modified"; | 229 | ctx->cfg.agefile = "info/web/last-modified"; |
227 | ctx->cfg.nocache = 0; | 230 | ctx->cfg.nocache = 0; |
228 | ctx->cfg.cache_size = 0; | 231 | ctx->cfg.cache_size = 0; |
229 | ctx->cfg.cache_dynamic_ttl = 5; | 232 | ctx->cfg.cache_dynamic_ttl = 5; |
230 | ctx->cfg.cache_max_create_time = 5; | 233 | ctx->cfg.cache_max_create_time = 5; |
231 | ctx->cfg.cache_repo_ttl = 5; | 234 | ctx->cfg.cache_repo_ttl = 5; |
232 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 235 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
233 | ctx->cfg.cache_root_ttl = 5; | 236 | ctx->cfg.cache_root_ttl = 5; |
234 | ctx->cfg.cache_static_ttl = -1; | 237 | ctx->cfg.cache_static_ttl = -1; |
235 | ctx->cfg.css = "/cgit.css"; | 238 | ctx->cfg.css = "/cgit.css"; |
236 | ctx->cfg.logo = "/cgit.png"; | 239 | ctx->cfg.logo = "/cgit.png"; |
237 | ctx->cfg.local_time = 0; | 240 | ctx->cfg.local_time = 0; |
238 | ctx->cfg.max_repo_count = 50; | 241 | ctx->cfg.max_repo_count = 50; |
239 | ctx->cfg.max_commit_count = 50; | 242 | ctx->cfg.max_commit_count = 50; |
240 | ctx->cfg.max_lock_attempts = 5; | 243 | ctx->cfg.max_lock_attempts = 5; |
241 | ctx->cfg.max_msg_len = 80; | 244 | ctx->cfg.max_msg_len = 80; |
242 | ctx->cfg.max_repodesc_len = 80; | 245 | ctx->cfg.max_repodesc_len = 80; |
243 | ctx->cfg.max_stats = 0; | 246 | ctx->cfg.max_stats = 0; |
244 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 247 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
245 | ctx->cfg.renamelimit = -1; | 248 | ctx->cfg.renamelimit = -1; |
246 | ctx->cfg.robots = "index, nofollow"; | 249 | ctx->cfg.robots = "index, nofollow"; |
247 | ctx->cfg.root_title = "Git repository browser"; | 250 | ctx->cfg.root_title = "Git repository browser"; |
248 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 251 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
249 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 252 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
250 | ctx->cfg.summary_branches = 10; | 253 | ctx->cfg.summary_branches = 10; |
251 | ctx->cfg.summary_log = 10; | 254 | ctx->cfg.summary_log = 10; |
252 | ctx->cfg.summary_tags = 10; | 255 | ctx->cfg.summary_tags = 10; |
253 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 256 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
254 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 257 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
255 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 258 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
256 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 259 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
257 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 260 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
258 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 261 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
259 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 262 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
260 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 263 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
261 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 264 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
262 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 265 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
263 | ctx->page.mimetype = "text/html"; | 266 | ctx->page.mimetype = "text/html"; |
264 | ctx->page.charset = PAGE_ENCODING; | 267 | ctx->page.charset = PAGE_ENCODING; |
265 | ctx->page.filename = NULL; | 268 | ctx->page.filename = NULL; |
266 | ctx->page.size = 0; | 269 | ctx->page.size = 0; |
267 | ctx->page.modified = time(NULL); | 270 | ctx->page.modified = time(NULL); |
268 | ctx->page.expires = ctx->page.modified; | 271 | ctx->page.expires = ctx->page.modified; |
269 | ctx->page.etag = NULL; | 272 | ctx->page.etag = NULL; |
270 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 273 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
271 | if (ctx->env.script_name) | 274 | if (ctx->env.script_name) |
272 | ctx->cfg.script_name = ctx->env.script_name; | 275 | ctx->cfg.script_name = ctx->env.script_name; |
273 | if (ctx->env.query_string) | 276 | if (ctx->env.query_string) |
274 | ctx->qry.raw = ctx->env.query_string; | 277 | ctx->qry.raw = ctx->env.query_string; |
275 | if (!ctx->env.cgit_config) | 278 | if (!ctx->env.cgit_config) |