author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
commit | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (patch) (unidiff) | |
tree | bc0b99adcce3a19f127e6eb2509585ed9486831e /cgit.c | |
parent | 31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (diff) | |
parent | df522794c38934be3229a11e0e2432a1f2a3bc8d (diff) | |
download | cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.zip cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.gz cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.bz2 |
Merge branch 'jh/scan-path'
* jh/scan-path:
scan_path(): Do not recurse into hidden directories by default
scan_path(): Improve handling of inaccessible directories
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -154,96 +154,98 @@ void config_cb(const char *name, const char *value) | |||
154 | else if (!strcmp(name, "enable-subject-links")) | 154 | else if (!strcmp(name, "enable-subject-links")) |
155 | ctx.cfg.enable_subject_links = atoi(value); | 155 | ctx.cfg.enable_subject_links = atoi(value); |
156 | else if (!strcmp(name, "enable-tree-linenumbers")) | 156 | else if (!strcmp(name, "enable-tree-linenumbers")) |
157 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 157 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
158 | else if (!strcmp(name, "max-stats")) | 158 | else if (!strcmp(name, "max-stats")) |
159 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 159 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
160 | else if (!strcmp(name, "cache-size")) | 160 | else if (!strcmp(name, "cache-size")) |
161 | ctx.cfg.cache_size = atoi(value); | 161 | ctx.cfg.cache_size = atoi(value); |
162 | else if (!strcmp(name, "cache-root")) | 162 | else if (!strcmp(name, "cache-root")) |
163 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); | 163 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
164 | else if (!strcmp(name, "cache-root-ttl")) | 164 | else if (!strcmp(name, "cache-root-ttl")) |
165 | ctx.cfg.cache_root_ttl = atoi(value); | 165 | ctx.cfg.cache_root_ttl = atoi(value); |
166 | else if (!strcmp(name, "cache-repo-ttl")) | 166 | else if (!strcmp(name, "cache-repo-ttl")) |
167 | ctx.cfg.cache_repo_ttl = atoi(value); | 167 | ctx.cfg.cache_repo_ttl = atoi(value); |
168 | else if (!strcmp(name, "cache-scanrc-ttl")) | 168 | else if (!strcmp(name, "cache-scanrc-ttl")) |
169 | ctx.cfg.cache_scanrc_ttl = atoi(value); | 169 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
170 | else if (!strcmp(name, "cache-static-ttl")) | 170 | else if (!strcmp(name, "cache-static-ttl")) |
171 | ctx.cfg.cache_static_ttl = atoi(value); | 171 | ctx.cfg.cache_static_ttl = atoi(value); |
172 | else if (!strcmp(name, "cache-dynamic-ttl")) | 172 | else if (!strcmp(name, "cache-dynamic-ttl")) |
173 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 173 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
174 | else if (!strcmp(name, "about-filter")) | 174 | else if (!strcmp(name, "about-filter")) |
175 | ctx.cfg.about_filter = new_filter(value, 0); | 175 | ctx.cfg.about_filter = new_filter(value, 0); |
176 | else if (!strcmp(name, "commit-filter")) | 176 | else if (!strcmp(name, "commit-filter")) |
177 | ctx.cfg.commit_filter = new_filter(value, 0); | 177 | ctx.cfg.commit_filter = new_filter(value, 0); |
178 | else if (!strcmp(name, "embedded")) | 178 | else if (!strcmp(name, "embedded")) |
179 | ctx.cfg.embedded = atoi(value); | 179 | ctx.cfg.embedded = atoi(value); |
180 | else if (!strcmp(name, "max-atom-items")) | 180 | else if (!strcmp(name, "max-atom-items")) |
181 | ctx.cfg.max_atom_items = atoi(value); | 181 | ctx.cfg.max_atom_items = atoi(value); |
182 | else if (!strcmp(name, "max-message-length")) | 182 | else if (!strcmp(name, "max-message-length")) |
183 | ctx.cfg.max_msg_len = atoi(value); | 183 | ctx.cfg.max_msg_len = atoi(value); |
184 | else if (!strcmp(name, "max-repodesc-length")) | 184 | else if (!strcmp(name, "max-repodesc-length")) |
185 | ctx.cfg.max_repodesc_len = atoi(value); | 185 | ctx.cfg.max_repodesc_len = atoi(value); |
186 | else if (!strcmp(name, "max-blob-size")) | 186 | else if (!strcmp(name, "max-blob-size")) |
187 | ctx.cfg.max_blob_size = atoi(value); | 187 | ctx.cfg.max_blob_size = atoi(value); |
188 | else if (!strcmp(name, "max-repo-count")) | 188 | else if (!strcmp(name, "max-repo-count")) |
189 | ctx.cfg.max_repo_count = atoi(value); | 189 | ctx.cfg.max_repo_count = atoi(value); |
190 | else if (!strcmp(name, "max-commit-count")) | 190 | else if (!strcmp(name, "max-commit-count")) |
191 | ctx.cfg.max_commit_count = atoi(value); | 191 | ctx.cfg.max_commit_count = atoi(value); |
192 | else if (!strcmp(name, "project-list")) | 192 | else if (!strcmp(name, "project-list")) |
193 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 193 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
194 | else if (!strcmp(name, "scan-path")) | 194 | else if (!strcmp(name, "scan-path")) |
195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 195 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
196 | process_cached_repolist(expand_macros(value)); | 196 | process_cached_repolist(expand_macros(value)); |
197 | else if (ctx.cfg.project_list) | 197 | else if (ctx.cfg.project_list) |
198 | scan_projects(expand_macros(value), | 198 | scan_projects(expand_macros(value), |
199 | ctx.cfg.project_list, repo_config); | 199 | ctx.cfg.project_list, repo_config); |
200 | else | 200 | else |
201 | scan_tree(expand_macros(value), repo_config); | 201 | scan_tree(expand_macros(value), repo_config); |
202 | else if (!strcmp(name, "scan-hidden-path")) | ||
203 | ctx.cfg.scan_hidden_path = atoi(value); | ||
202 | else if (!strcmp(name, "section-from-path")) | 204 | else if (!strcmp(name, "section-from-path")) |
203 | ctx.cfg.section_from_path = atoi(value); | 205 | ctx.cfg.section_from_path = atoi(value); |
204 | else if (!strcmp(name, "source-filter")) | 206 | else if (!strcmp(name, "source-filter")) |
205 | ctx.cfg.source_filter = new_filter(value, 1); | 207 | ctx.cfg.source_filter = new_filter(value, 1); |
206 | else if (!strcmp(name, "summary-log")) | 208 | else if (!strcmp(name, "summary-log")) |
207 | ctx.cfg.summary_log = atoi(value); | 209 | ctx.cfg.summary_log = atoi(value); |
208 | else if (!strcmp(name, "summary-branches")) | 210 | else if (!strcmp(name, "summary-branches")) |
209 | ctx.cfg.summary_branches = atoi(value); | 211 | ctx.cfg.summary_branches = atoi(value); |
210 | else if (!strcmp(name, "summary-tags")) | 212 | else if (!strcmp(name, "summary-tags")) |
211 | ctx.cfg.summary_tags = atoi(value); | 213 | ctx.cfg.summary_tags = atoi(value); |
212 | else if (!strcmp(name, "side-by-side-diffs")) | 214 | else if (!strcmp(name, "side-by-side-diffs")) |
213 | ctx.cfg.ssdiff = atoi(value); | 215 | ctx.cfg.ssdiff = atoi(value); |
214 | else if (!strcmp(name, "agefile")) | 216 | else if (!strcmp(name, "agefile")) |
215 | ctx.cfg.agefile = xstrdup(value); | 217 | ctx.cfg.agefile = xstrdup(value); |
216 | else if (!strcmp(name, "renamelimit")) | 218 | else if (!strcmp(name, "renamelimit")) |
217 | ctx.cfg.renamelimit = atoi(value); | 219 | ctx.cfg.renamelimit = atoi(value); |
218 | else if (!strcmp(name, "remove-suffix")) | 220 | else if (!strcmp(name, "remove-suffix")) |
219 | ctx.cfg.remove_suffix = atoi(value); | 221 | ctx.cfg.remove_suffix = atoi(value); |
220 | else if (!strcmp(name, "robots")) | 222 | else if (!strcmp(name, "robots")) |
221 | ctx.cfg.robots = xstrdup(value); | 223 | ctx.cfg.robots = xstrdup(value); |
222 | else if (!strcmp(name, "clone-prefix")) | 224 | else if (!strcmp(name, "clone-prefix")) |
223 | ctx.cfg.clone_prefix = xstrdup(value); | 225 | ctx.cfg.clone_prefix = xstrdup(value); |
224 | else if (!strcmp(name, "local-time")) | 226 | else if (!strcmp(name, "local-time")) |
225 | ctx.cfg.local_time = atoi(value); | 227 | ctx.cfg.local_time = atoi(value); |
226 | else if (!prefixcmp(name, "mimetype.")) | 228 | else if (!prefixcmp(name, "mimetype.")) |
227 | add_mimetype(name + 9, value); | 229 | add_mimetype(name + 9, value); |
228 | else if (!strcmp(name, "include")) | 230 | else if (!strcmp(name, "include")) |
229 | parse_configfile(expand_macros(value), config_cb); | 231 | parse_configfile(expand_macros(value), config_cb); |
230 | } | 232 | } |
231 | 233 | ||
232 | static void querystring_cb(const char *name, const char *value) | 234 | static void querystring_cb(const char *name, const char *value) |
233 | { | 235 | { |
234 | if (!value) | 236 | if (!value) |
235 | value = ""; | 237 | value = ""; |
236 | 238 | ||
237 | if (!strcmp(name,"r")) { | 239 | if (!strcmp(name,"r")) { |
238 | ctx.qry.repo = xstrdup(value); | 240 | ctx.qry.repo = xstrdup(value); |
239 | ctx.repo = cgit_get_repoinfo(value); | 241 | ctx.repo = cgit_get_repoinfo(value); |
240 | } else if (!strcmp(name, "p")) { | 242 | } else if (!strcmp(name, "p")) { |
241 | ctx.qry.page = xstrdup(value); | 243 | ctx.qry.page = xstrdup(value); |
242 | } else if (!strcmp(name, "url")) { | 244 | } else if (!strcmp(name, "url")) { |
243 | if (*value == '/') | 245 | if (*value == '/') |
244 | value++; | 246 | value++; |
245 | ctx.qry.url = xstrdup(value); | 247 | ctx.qry.url = xstrdup(value); |
246 | cgit_parse_url(value); | 248 | cgit_parse_url(value); |
247 | } else if (!strcmp(name, "qt")) { | 249 | } else if (!strcmp(name, "qt")) { |
248 | ctx.qry.grep = xstrdup(value); | 250 | ctx.qry.grep = xstrdup(value); |
249 | } else if (!strcmp(name, "q")) { | 251 | } else if (!strcmp(name, "q")) { |
@@ -274,96 +276,97 @@ static void querystring_cb(const char *name, const char *value) | |||
274 | } else if (!strcmp(name, "ss")) { | 276 | } else if (!strcmp(name, "ss")) { |
275 | ctx.qry.ssdiff = atoi(value); | 277 | ctx.qry.ssdiff = atoi(value); |
276 | } else if (!strcmp(name, "all")) { | 278 | } else if (!strcmp(name, "all")) { |
277 | ctx.qry.show_all = atoi(value); | 279 | ctx.qry.show_all = atoi(value); |
278 | } else if (!strcmp(name, "context")) { | 280 | } else if (!strcmp(name, "context")) { |
279 | ctx.qry.context = atoi(value); | 281 | ctx.qry.context = atoi(value); |
280 | } else if (!strcmp(name, "ignorews")) { | 282 | } else if (!strcmp(name, "ignorews")) { |
281 | ctx.qry.ignorews = atoi(value); | 283 | ctx.qry.ignorews = atoi(value); |
282 | } | 284 | } |
283 | } | 285 | } |
284 | 286 | ||
285 | char *xstrdupn(const char *str) | 287 | char *xstrdupn(const char *str) |
286 | { | 288 | { |
287 | return (str ? xstrdup(str) : NULL); | 289 | return (str ? xstrdup(str) : NULL); |
288 | } | 290 | } |
289 | 291 | ||
290 | static void prepare_context(struct cgit_context *ctx) | 292 | static void prepare_context(struct cgit_context *ctx) |
291 | { | 293 | { |
292 | memset(ctx, 0, sizeof(*ctx)); | 294 | memset(ctx, 0, sizeof(*ctx)); |
293 | ctx->cfg.agefile = "info/web/last-modified"; | 295 | ctx->cfg.agefile = "info/web/last-modified"; |
294 | ctx->cfg.nocache = 0; | 296 | ctx->cfg.nocache = 0; |
295 | ctx->cfg.cache_size = 0; | 297 | ctx->cfg.cache_size = 0; |
296 | ctx->cfg.cache_dynamic_ttl = 5; | 298 | ctx->cfg.cache_dynamic_ttl = 5; |
297 | ctx->cfg.cache_max_create_time = 5; | 299 | ctx->cfg.cache_max_create_time = 5; |
298 | ctx->cfg.cache_repo_ttl = 5; | 300 | ctx->cfg.cache_repo_ttl = 5; |
299 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 301 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
300 | ctx->cfg.cache_root_ttl = 5; | 302 | ctx->cfg.cache_root_ttl = 5; |
301 | ctx->cfg.cache_scanrc_ttl = 15; | 303 | ctx->cfg.cache_scanrc_ttl = 15; |
302 | ctx->cfg.cache_static_ttl = -1; | 304 | ctx->cfg.cache_static_ttl = -1; |
303 | ctx->cfg.css = "/cgit.css"; | 305 | ctx->cfg.css = "/cgit.css"; |
304 | ctx->cfg.logo = "/cgit.png"; | 306 | ctx->cfg.logo = "/cgit.png"; |
305 | ctx->cfg.local_time = 0; | 307 | ctx->cfg.local_time = 0; |
306 | ctx->cfg.enable_gitweb_owner = 1; | 308 | ctx->cfg.enable_gitweb_owner = 1; |
307 | ctx->cfg.enable_tree_linenumbers = 1; | 309 | ctx->cfg.enable_tree_linenumbers = 1; |
308 | ctx->cfg.max_repo_count = 50; | 310 | ctx->cfg.max_repo_count = 50; |
309 | ctx->cfg.max_commit_count = 50; | 311 | ctx->cfg.max_commit_count = 50; |
310 | ctx->cfg.max_lock_attempts = 5; | 312 | ctx->cfg.max_lock_attempts = 5; |
311 | ctx->cfg.max_msg_len = 80; | 313 | ctx->cfg.max_msg_len = 80; |
312 | ctx->cfg.max_repodesc_len = 80; | 314 | ctx->cfg.max_repodesc_len = 80; |
313 | ctx->cfg.max_blob_size = 0; | 315 | ctx->cfg.max_blob_size = 0; |
314 | ctx->cfg.max_stats = 0; | 316 | ctx->cfg.max_stats = 0; |
315 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 317 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
316 | ctx->cfg.project_list = NULL; | 318 | ctx->cfg.project_list = NULL; |
317 | ctx->cfg.renamelimit = -1; | 319 | ctx->cfg.renamelimit = -1; |
318 | ctx->cfg.remove_suffix = 0; | 320 | ctx->cfg.remove_suffix = 0; |
319 | ctx->cfg.robots = "index, nofollow"; | 321 | ctx->cfg.robots = "index, nofollow"; |
320 | ctx->cfg.root_title = "Git repository browser"; | 322 | ctx->cfg.root_title = "Git repository browser"; |
321 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 323 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
324 | ctx->cfg.scan_hidden_path = 0; | ||
322 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 325 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
323 | ctx->cfg.section = ""; | 326 | ctx->cfg.section = ""; |
324 | ctx->cfg.summary_branches = 10; | 327 | ctx->cfg.summary_branches = 10; |
325 | ctx->cfg.summary_log = 10; | 328 | ctx->cfg.summary_log = 10; |
326 | ctx->cfg.summary_tags = 10; | 329 | ctx->cfg.summary_tags = 10; |
327 | ctx->cfg.max_atom_items = 10; | 330 | ctx->cfg.max_atom_items = 10; |
328 | ctx->cfg.ssdiff = 0; | 331 | ctx->cfg.ssdiff = 0; |
329 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 332 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
330 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 333 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
331 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 334 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
332 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 335 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
333 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 336 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
334 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 337 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
335 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 338 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
336 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 339 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
337 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 340 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
338 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 341 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
339 | ctx->page.mimetype = "text/html"; | 342 | ctx->page.mimetype = "text/html"; |
340 | ctx->page.charset = PAGE_ENCODING; | 343 | ctx->page.charset = PAGE_ENCODING; |
341 | ctx->page.filename = NULL; | 344 | ctx->page.filename = NULL; |
342 | ctx->page.size = 0; | 345 | ctx->page.size = 0; |
343 | ctx->page.modified = time(NULL); | 346 | ctx->page.modified = time(NULL); |
344 | ctx->page.expires = ctx->page.modified; | 347 | ctx->page.expires = ctx->page.modified; |
345 | ctx->page.etag = NULL; | 348 | ctx->page.etag = NULL; |
346 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 349 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
347 | if (ctx->env.script_name) | 350 | if (ctx->env.script_name) |
348 | ctx->cfg.script_name = ctx->env.script_name; | 351 | ctx->cfg.script_name = ctx->env.script_name; |
349 | if (ctx->env.query_string) | 352 | if (ctx->env.query_string) |
350 | ctx->qry.raw = ctx->env.query_string; | 353 | ctx->qry.raw = ctx->env.query_string; |
351 | if (!ctx->env.cgit_config) | 354 | if (!ctx->env.cgit_config) |
352 | ctx->env.cgit_config = CGIT_CONFIG; | 355 | ctx->env.cgit_config = CGIT_CONFIG; |
353 | } | 356 | } |
354 | 357 | ||
355 | struct refmatch { | 358 | struct refmatch { |
356 | char *req_ref; | 359 | char *req_ref; |
357 | char *first_ref; | 360 | char *first_ref; |
358 | int match; | 361 | int match; |
359 | }; | 362 | }; |
360 | 363 | ||
361 | int find_current_ref(const char *refname, const unsigned char *sha1, | 364 | int find_current_ref(const char *refname, const unsigned char *sha1, |
362 | int flags, void *cb_data) | 365 | int flags, void *cb_data) |
363 | { | 366 | { |
364 | struct refmatch *info; | 367 | struct refmatch *info; |
365 | 368 | ||
366 | info = (struct refmatch *)cb_data; | 369 | info = (struct refmatch *)cb_data; |
367 | if (!strcmp(refname, info->req_ref)) | 370 | if (!strcmp(refname, info->req_ref)) |
368 | info->match = 1; | 371 | info->match = 1; |
369 | if (!info->first_ref) | 372 | if (!info->first_ref) |