author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:39:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:39:44 (UTC) |
commit | 97b3d252629a8a3b9d356c2532dec7611438e4b9 (patch) (unidiff) | |
tree | aa8225159ce897830f12b3f2f73f4af12f0d4f8e | |
parent | e976df27952ca1e450c1c3d420532ac9f5e3036b (diff) | |
download | cgit-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>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,56 +1,56 @@ | |||
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 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | 20 | struct 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 | ||
35 | void config_cb(const char *name, const char *value) | 35 | void 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); |