|
diff --git a/cgit.c b/cgit.c index e1d38c2..08cb5d2 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -23,99 +23,99 @@ void add_mimetype(const char *name, const char *value) |
23 | |
23 | |
24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); |
24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); |
25 | item->util = xstrdup(value); |
25 | item->util = xstrdup(value); |
26 | } |
26 | } |
27 | |
27 | |
28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
29 | { |
29 | { |
30 | struct cgit_filter *f; |
30 | struct cgit_filter *f; |
31 | |
31 | |
32 | if (!cmd || !cmd[0]) |
32 | if (!cmd || !cmd[0]) |
33 | return NULL; |
33 | return NULL; |
34 | |
34 | |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
36 | f->cmd = xstrdup(cmd); |
36 | f->cmd = xstrdup(cmd); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
38 | f->argv[0] = f->cmd; |
38 | f->argv[0] = f->cmd; |
39 | f->argv[1] = NULL; |
39 | f->argv[1] = NULL; |
40 | return f; |
40 | return f; |
41 | } |
41 | } |
42 | |
42 | |
43 | static void process_cached_repolist(const char *path); |
43 | static void process_cached_repolist(const char *path); |
44 | |
44 | |
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
46 | { |
46 | { |
47 | if (!strcmp(name, "name")) |
47 | if (!strcmp(name, "name")) |
48 | repo->name = xstrdup(value); |
48 | repo->name = xstrdup(value); |
49 | else if (!strcmp(name, "clone-url")) |
49 | else if (!strcmp(name, "clone-url")) |
50 | repo->clone_url = xstrdup(value); |
50 | repo->clone_url = xstrdup(value); |
51 | else if (!strcmp(name, "desc")) |
51 | else if (!strcmp(name, "desc")) |
52 | repo->desc = xstrdup(value); |
52 | repo->desc = xstrdup(value); |
53 | else if (!strcmp(name, "owner")) |
53 | else if (!strcmp(name, "owner")) |
54 | repo->owner = xstrdup(value); |
54 | repo->owner = xstrdup(value); |
55 | else if (!strcmp(name, "defbranch")) |
55 | else if (!strcmp(name, "defbranch")) |
56 | repo->defbranch = xstrdup(value); |
56 | repo->defbranch = xstrdup(value); |
57 | else if (!strcmp(name, "snapshots")) |
57 | else if (!strcmp(name, "snapshots")) |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
59 | else if (!strcmp(name, "enable-log-filecount")) |
59 | else if (!strcmp(name, "enable-log-filecount")) |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) |
61 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | else if (!strcmp(name, "max-stats")) |
63 | else if (!strcmp(name, "max-stats")) |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); |
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, "readme") && value != NULL) { |
69 | else if (!strcmp(name, "readme") && value != NULL) { |
70 | if (*value == '/') |
70 | if (*value == '/') |
71 | ctx.repo->readme = xstrdup(value); |
71 | repo->readme = xstrdup(value); |
72 | else |
72 | else |
73 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
73 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
74 | } else if (ctx.cfg.enable_filter_overrides) { |
74 | } else if (ctx.cfg.enable_filter_overrides) { |
75 | if (!strcmp(name, "about-filter")) |
75 | if (!strcmp(name, "about-filter")) |
76 | repo->about_filter = new_filter(value, 0); |
76 | repo->about_filter = new_filter(value, 0); |
77 | else if (!strcmp(name, "commit-filter")) |
77 | else if (!strcmp(name, "commit-filter")) |
78 | repo->commit_filter = new_filter(value, 0); |
78 | repo->commit_filter = new_filter(value, 0); |
79 | else if (!strcmp(name, "source-filter")) |
79 | else if (!strcmp(name, "source-filter")) |
80 | repo->source_filter = new_filter(value, 1); |
80 | repo->source_filter = new_filter(value, 1); |
81 | } |
81 | } |
82 | } |
82 | } |
83 | |
83 | |
84 | void config_cb(const char *name, const char *value) |
84 | void config_cb(const char *name, const char *value) |
85 | { |
85 | { |
86 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
86 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
87 | ctx.cfg.section = xstrdup(value); |
87 | ctx.cfg.section = xstrdup(value); |
88 | else if (!strcmp(name, "repo.url")) |
88 | else if (!strcmp(name, "repo.url")) |
89 | ctx.repo = cgit_add_repo(value); |
89 | ctx.repo = cgit_add_repo(value); |
90 | else if (ctx.repo && !strcmp(name, "repo.path")) |
90 | else if (ctx.repo && !strcmp(name, "repo.path")) |
91 | ctx.repo->path = trim_end(value, '/'); |
91 | ctx.repo->path = trim_end(value, '/'); |
92 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
92 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
93 | repo_config(ctx.repo, name + 5, value); |
93 | repo_config(ctx.repo, name + 5, value); |
94 | else if (!strcmp(name, "root-title")) |
94 | else if (!strcmp(name, "root-title")) |
95 | ctx.cfg.root_title = xstrdup(value); |
95 | ctx.cfg.root_title = xstrdup(value); |
96 | else if (!strcmp(name, "root-desc")) |
96 | else if (!strcmp(name, "root-desc")) |
97 | ctx.cfg.root_desc = xstrdup(value); |
97 | ctx.cfg.root_desc = xstrdup(value); |
98 | else if (!strcmp(name, "root-readme")) |
98 | else if (!strcmp(name, "root-readme")) |
99 | ctx.cfg.root_readme = xstrdup(value); |
99 | ctx.cfg.root_readme = xstrdup(value); |
100 | else if (!strcmp(name, "css")) |
100 | else if (!strcmp(name, "css")) |
101 | ctx.cfg.css = xstrdup(value); |
101 | ctx.cfg.css = xstrdup(value); |
102 | else if (!strcmp(name, "favicon")) |
102 | else if (!strcmp(name, "favicon")) |
103 | ctx.cfg.favicon = xstrdup(value); |
103 | ctx.cfg.favicon = xstrdup(value); |
104 | else if (!strcmp(name, "footer")) |
104 | else if (!strcmp(name, "footer")) |
105 | ctx.cfg.footer = xstrdup(value); |
105 | ctx.cfg.footer = xstrdup(value); |
106 | else if (!strcmp(name, "head-include")) |
106 | else if (!strcmp(name, "head-include")) |
107 | ctx.cfg.head_include = xstrdup(value); |
107 | ctx.cfg.head_include = xstrdup(value); |
108 | else if (!strcmp(name, "header")) |
108 | else if (!strcmp(name, "header")) |
109 | ctx.cfg.header = xstrdup(value); |
109 | ctx.cfg.header = xstrdup(value); |
110 | else if (!strcmp(name, "logo")) |
110 | else if (!strcmp(name, "logo")) |
111 | ctx.cfg.logo = xstrdup(value); |
111 | ctx.cfg.logo = xstrdup(value); |
112 | else if (!strcmp(name, "index-header")) |
112 | else if (!strcmp(name, "index-header")) |
113 | ctx.cfg.index_header = xstrdup(value); |
113 | ctx.cfg.index_header = xstrdup(value); |
114 | else if (!strcmp(name, "index-info")) |
114 | else if (!strcmp(name, "index-info")) |
115 | ctx.cfg.index_info = xstrdup(value); |
115 | ctx.cfg.index_info = xstrdup(value); |
116 | else if (!strcmp(name, "logo-link")) |
116 | else if (!strcmp(name, "logo-link")) |
117 | ctx.cfg.logo_link = xstrdup(value); |
117 | ctx.cfg.logo_link = xstrdup(value); |
118 | else if (!strcmp(name, "module-link")) |
118 | else if (!strcmp(name, "module-link")) |
119 | ctx.cfg.module_link = xstrdup(value); |
119 | ctx.cfg.module_link = xstrdup(value); |
120 | else if (!strcmp(name, "virtual-root")) { |
120 | else if (!strcmp(name, "virtual-root")) { |
121 | ctx.cfg.virtual_root = trim_end(value, '/'); |
121 | ctx.cfg.virtual_root = trim_end(value, '/'); |
|