|
diff --git a/cgit.c b/cgit.c index 7264b8e..90ae124 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -21,51 +21,97 @@ void add_mimetype(const char *name, const char *value) |
21 | { |
21 | { |
22 | struct string_list_item *item; |
22 | struct string_list_item *item; |
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) |
| |
46 | { |
| |
47 | if (!strcmp(name, "name")) |
| |
48 | repo->name = xstrdup(value); |
| |
49 | else if (!strcmp(name, "clone-url")) |
| |
50 | repo->clone_url = xstrdup(value); |
| |
51 | else if (!strcmp(name, "desc")) |
| |
52 | repo->desc = xstrdup(value); |
| |
53 | else if (!strcmp(name, "owner")) |
| |
54 | repo->owner = xstrdup(value); |
| |
55 | else if (!strcmp(name, "defbranch")) |
| |
56 | repo->defbranch = xstrdup(value); |
| |
57 | else if (!strcmp(name, "snapshots")) |
| |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
| |
59 | else if (!strcmp(name, "enable-log-filecount")) |
| |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
| |
61 | else if (!strcmp(name, "enable-log-linecount")) |
| |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
63 | else if (!strcmp(name, "max-stats")) |
| |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); |
| |
65 | else if (!strcmp(name, "module-link")) |
| |
66 | repo->module_link= xstrdup(value); |
| |
67 | else if (!strcmp(name, "section")) |
| |
68 | repo->section = xstrdup(value); |
| |
69 | else if (!strcmp(name, "about-filter")) |
| |
70 | repo->about_filter = new_filter(value, 0); |
| |
71 | else if (!strcmp(name, "commit-filter")) |
| |
72 | repo->commit_filter = new_filter(value, 0); |
| |
73 | else if (!strcmp(name, "source-filter")) |
| |
74 | repo->source_filter = new_filter(value, 1); |
| |
75 | else if (!strcmp(name, "readme") && value != NULL) { |
| |
76 | if (*value == '/') |
| |
77 | ctx.repo->readme = xstrdup(value); |
| |
78 | else |
| |
79 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
| |
80 | } |
| |
81 | } |
| |
82 | |
45 | void config_cb(const char *name, const char *value) |
83 | void config_cb(const char *name, const char *value) |
46 | { |
84 | { |
47 | if (!strcmp(name, "root-title")) |
85 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
| |
86 | ctx.cfg.section = xstrdup(value); |
| |
87 | else if (!strcmp(name, "repo.url")) |
| |
88 | ctx.repo = cgit_add_repo(value); |
| |
89 | else if (ctx.repo && !strcmp(name, "repo.path")) |
| |
90 | ctx.repo->path = trim_end(value, '/'); |
| |
91 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
| |
92 | repo_config(ctx.repo, name + 5, value); |
| |
93 | else if (!strcmp(name, "root-title")) |
48 | ctx.cfg.root_title = xstrdup(value); |
94 | ctx.cfg.root_title = xstrdup(value); |
49 | else if (!strcmp(name, "root-desc")) |
95 | else if (!strcmp(name, "root-desc")) |
50 | ctx.cfg.root_desc = xstrdup(value); |
96 | ctx.cfg.root_desc = xstrdup(value); |
51 | else if (!strcmp(name, "root-readme")) |
97 | else if (!strcmp(name, "root-readme")) |
52 | ctx.cfg.root_readme = xstrdup(value); |
98 | ctx.cfg.root_readme = xstrdup(value); |
53 | else if (!strcmp(name, "css")) |
99 | else if (!strcmp(name, "css")) |
54 | ctx.cfg.css = xstrdup(value); |
100 | ctx.cfg.css = xstrdup(value); |
55 | else if (!strcmp(name, "favicon")) |
101 | else if (!strcmp(name, "favicon")) |
56 | ctx.cfg.favicon = xstrdup(value); |
102 | ctx.cfg.favicon = xstrdup(value); |
57 | else if (!strcmp(name, "footer")) |
103 | else if (!strcmp(name, "footer")) |
58 | ctx.cfg.footer = xstrdup(value); |
104 | ctx.cfg.footer = xstrdup(value); |
59 | else if (!strcmp(name, "head-include")) |
105 | else if (!strcmp(name, "head-include")) |
60 | ctx.cfg.head_include = xstrdup(value); |
106 | ctx.cfg.head_include = xstrdup(value); |
61 | else if (!strcmp(name, "header")) |
107 | else if (!strcmp(name, "header")) |
62 | ctx.cfg.header = xstrdup(value); |
108 | ctx.cfg.header = xstrdup(value); |
63 | else if (!strcmp(name, "logo")) |
109 | else if (!strcmp(name, "logo")) |
64 | ctx.cfg.logo = xstrdup(value); |
110 | ctx.cfg.logo = xstrdup(value); |
65 | else if (!strcmp(name, "index-header")) |
111 | else if (!strcmp(name, "index-header")) |
66 | ctx.cfg.index_header = xstrdup(value); |
112 | ctx.cfg.index_header = xstrdup(value); |
67 | else if (!strcmp(name, "index-info")) |
113 | else if (!strcmp(name, "index-info")) |
68 | ctx.cfg.index_info = xstrdup(value); |
114 | ctx.cfg.index_info = xstrdup(value); |
69 | else if (!strcmp(name, "logo-link")) |
115 | else if (!strcmp(name, "logo-link")) |
70 | ctx.cfg.logo_link = xstrdup(value); |
116 | ctx.cfg.logo_link = xstrdup(value); |
71 | else if (!strcmp(name, "module-link")) |
117 | else if (!strcmp(name, "module-link")) |
@@ -122,88 +168,49 @@ void config_cb(const char *name, const char *value) |
122 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
168 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
123 | process_cached_repolist(value); |
169 | process_cached_repolist(value); |
124 | else |
170 | else |
125 | scan_tree(value); |
171 | scan_tree(value); |
126 | else if (!strcmp(name, "source-filter")) |
172 | else if (!strcmp(name, "source-filter")) |
127 | ctx.cfg.source_filter = new_filter(value, 1); |
173 | ctx.cfg.source_filter = new_filter(value, 1); |
128 | else if (!strcmp(name, "summary-log")) |
174 | else if (!strcmp(name, "summary-log")) |
129 | ctx.cfg.summary_log = atoi(value); |
175 | ctx.cfg.summary_log = atoi(value); |
130 | else if (!strcmp(name, "summary-branches")) |
176 | else if (!strcmp(name, "summary-branches")) |
131 | ctx.cfg.summary_branches = atoi(value); |
177 | ctx.cfg.summary_branches = atoi(value); |
132 | else if (!strcmp(name, "summary-tags")) |
178 | else if (!strcmp(name, "summary-tags")) |
133 | ctx.cfg.summary_tags = atoi(value); |
179 | ctx.cfg.summary_tags = atoi(value); |
134 | else if (!strcmp(name, "agefile")) |
180 | else if (!strcmp(name, "agefile")) |
135 | ctx.cfg.agefile = xstrdup(value); |
181 | ctx.cfg.agefile = xstrdup(value); |
136 | else if (!strcmp(name, "renamelimit")) |
182 | else if (!strcmp(name, "renamelimit")) |
137 | ctx.cfg.renamelimit = atoi(value); |
183 | ctx.cfg.renamelimit = atoi(value); |
138 | else if (!strcmp(name, "robots")) |
184 | else if (!strcmp(name, "robots")) |
139 | ctx.cfg.robots = xstrdup(value); |
185 | ctx.cfg.robots = xstrdup(value); |
140 | else if (!strcmp(name, "clone-prefix")) |
186 | else if (!strcmp(name, "clone-prefix")) |
141 | ctx.cfg.clone_prefix = xstrdup(value); |
187 | ctx.cfg.clone_prefix = xstrdup(value); |
142 | else if (!strcmp(name, "local-time")) |
188 | else if (!strcmp(name, "local-time")) |
143 | ctx.cfg.local_time = atoi(value); |
189 | ctx.cfg.local_time = atoi(value); |
144 | else if (!prefixcmp(name, "mimetype.")) |
190 | else if (!prefixcmp(name, "mimetype.")) |
145 | add_mimetype(name + 9, value); |
191 | add_mimetype(name + 9, value); |
146 | else if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
192 | else if (!strcmp(name, "include")) |
147 | ctx.cfg.section = xstrdup(value); |
| |
148 | else if (!strcmp(name, "repo.url")) |
| |
149 | ctx.repo = cgit_add_repo(value); |
| |
150 | else if (!strcmp(name, "repo.name")) |
| |
151 | ctx.repo->name = xstrdup(value); |
| |
152 | else if (ctx.repo && !strcmp(name, "repo.path")) |
| |
153 | ctx.repo->path = trim_end(value, '/'); |
| |
154 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
| |
155 | ctx.repo->clone_url = xstrdup(value); |
| |
156 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
| |
157 | ctx.repo->desc = xstrdup(value); |
| |
158 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
| |
159 | ctx.repo->owner = xstrdup(value); |
| |
160 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
| |
161 | ctx.repo->defbranch = xstrdup(value); |
| |
162 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
| |
163 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
| |
164 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
| |
165 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
| |
166 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
| |
167 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
168 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
| |
169 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
| |
170 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
| |
171 | ctx.repo->module_link= xstrdup(value); |
| |
172 | else if (ctx.repo && !strcmp(name, "repo.section")) |
| |
173 | ctx.repo->section = xstrdup(value); |
| |
174 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
| |
175 | ctx.repo->about_filter = new_filter(value, 0); |
| |
176 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
| |
177 | ctx.repo->commit_filter = new_filter(value, 0); |
| |
178 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
| |
179 | ctx.repo->source_filter = new_filter(value, 1); |
| |
180 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
| |
181 | if (*value == '/') |
| |
182 | ctx.repo->readme = xstrdup(value); |
| |
183 | else |
| |
184 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
| |
185 | } else if (!strcmp(name, "include")) |
| |
186 | parse_configfile(value, config_cb); |
193 | parse_configfile(value, config_cb); |
187 | } |
194 | } |
188 | |
195 | |
189 | static void querystring_cb(const char *name, const char *value) |
196 | static void querystring_cb(const char *name, const char *value) |
190 | { |
197 | { |
191 | if (!value) |
198 | if (!value) |
192 | value = ""; |
199 | value = ""; |
193 | |
200 | |
194 | if (!strcmp(name,"r")) { |
201 | if (!strcmp(name,"r")) { |
195 | ctx.qry.repo = xstrdup(value); |
202 | ctx.qry.repo = xstrdup(value); |
196 | ctx.repo = cgit_get_repoinfo(value); |
203 | ctx.repo = cgit_get_repoinfo(value); |
197 | } else if (!strcmp(name, "p")) { |
204 | } else if (!strcmp(name, "p")) { |
198 | ctx.qry.page = xstrdup(value); |
205 | ctx.qry.page = xstrdup(value); |
199 | } else if (!strcmp(name, "url")) { |
206 | } else if (!strcmp(name, "url")) { |
200 | ctx.qry.url = xstrdup(value); |
207 | ctx.qry.url = xstrdup(value); |
201 | cgit_parse_url(value); |
208 | cgit_parse_url(value); |
202 | } else if (!strcmp(name, "qt")) { |
209 | } else if (!strcmp(name, "qt")) { |
203 | ctx.qry.grep = xstrdup(value); |
210 | ctx.qry.grep = xstrdup(value); |
204 | } else if (!strcmp(name, "q")) { |
211 | } else if (!strcmp(name, "q")) { |
205 | ctx.qry.search = xstrdup(value); |
212 | ctx.qry.search = xstrdup(value); |
206 | } else if (!strcmp(name, "h")) { |
213 | } else if (!strcmp(name, "h")) { |
207 | ctx.qry.head = xstrdup(value); |
214 | ctx.qry.head = xstrdup(value); |
208 | ctx.qry.has_symref = 1; |
215 | ctx.qry.has_symref = 1; |
209 | } else if (!strcmp(name, "id")) { |
216 | } else if (!strcmp(name, "id")) { |
|