|
diff --git a/cgit.c b/cgit.c index b0e1c44..97f5e08 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -75,128 +75,130 @@ void config_cb(const char *name, const char *value) |
75 | } else if (!strcmp(name, "nocache")) |
75 | } else if (!strcmp(name, "nocache")) |
76 | ctx.cfg.nocache = atoi(value); |
76 | ctx.cfg.nocache = atoi(value); |
77 | else if (!strcmp(name, "noplainemail")) |
77 | else if (!strcmp(name, "noplainemail")) |
78 | ctx.cfg.noplainemail = atoi(value); |
78 | ctx.cfg.noplainemail = atoi(value); |
79 | else if (!strcmp(name, "noheader")) |
79 | else if (!strcmp(name, "noheader")) |
80 | ctx.cfg.noheader = atoi(value); |
80 | ctx.cfg.noheader = atoi(value); |
81 | else if (!strcmp(name, "snapshots")) |
81 | else if (!strcmp(name, "snapshots")) |
82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
82 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
83 | else if (!strcmp(name, "enable-index-links")) |
83 | else if (!strcmp(name, "enable-index-links")) |
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.scan")) |
| |
140 | scan_tree(value); |
139 | else if (!strcmp(name, "repo.url")) |
141 | else if (!strcmp(name, "repo.url")) |
140 | ctx.repo = cgit_add_repo(value); |
142 | ctx.repo = cgit_add_repo(value); |
141 | else if (!strcmp(name, "repo.name")) |
143 | else if (!strcmp(name, "repo.name")) |
142 | ctx.repo->name = xstrdup(value); |
144 | ctx.repo->name = xstrdup(value); |
143 | else if (ctx.repo && !strcmp(name, "repo.path")) |
145 | else if (ctx.repo && !strcmp(name, "repo.path")) |
144 | ctx.repo->path = trim_end(value, '/'); |
146 | ctx.repo->path = trim_end(value, '/'); |
145 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
147 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
146 | ctx.repo->clone_url = xstrdup(value); |
148 | ctx.repo->clone_url = xstrdup(value); |
147 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
149 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
148 | ctx.repo->desc = xstrdup(value); |
150 | ctx.repo->desc = xstrdup(value); |
149 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
151 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
150 | ctx.repo->owner = xstrdup(value); |
152 | ctx.repo->owner = xstrdup(value); |
151 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
153 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
152 | ctx.repo->defbranch = xstrdup(value); |
154 | ctx.repo->defbranch = xstrdup(value); |
153 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
155 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
154 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
156 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
155 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
156 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
158 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
157 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
159 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
158 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
160 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
159 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
161 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
160 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
162 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
161 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
163 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
162 | ctx.repo->module_link= xstrdup(value); |
164 | ctx.repo->module_link= xstrdup(value); |
163 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
165 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
164 | ctx.repo->about_filter = new_filter(value, 0); |
166 | ctx.repo->about_filter = new_filter(value, 0); |
165 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
167 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
166 | ctx.repo->commit_filter = new_filter(value, 0); |
168 | ctx.repo->commit_filter = new_filter(value, 0); |
167 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
169 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
168 | ctx.repo->source_filter = new_filter(value, 1); |
170 | ctx.repo->source_filter = new_filter(value, 1); |
169 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
171 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
170 | if (*value == '/') |
172 | if (*value == '/') |
171 | ctx.repo->readme = xstrdup(value); |
173 | ctx.repo->readme = xstrdup(value); |
172 | else |
174 | else |
173 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
175 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
174 | } else if (!strcmp(name, "include")) |
176 | } else if (!strcmp(name, "include")) |
175 | parse_configfile(value, config_cb); |
177 | parse_configfile(value, config_cb); |
176 | } |
178 | } |
177 | |
179 | |
178 | static void querystring_cb(const char *name, const char *value) |
180 | static void querystring_cb(const char *name, const char *value) |
179 | { |
181 | { |
180 | if (!value) |
182 | if (!value) |
181 | value = ""; |
183 | value = ""; |
182 | |
184 | |
183 | if (!strcmp(name,"r")) { |
185 | if (!strcmp(name,"r")) { |
184 | ctx.qry.repo = xstrdup(value); |
186 | ctx.qry.repo = xstrdup(value); |
185 | ctx.repo = cgit_get_repoinfo(value); |
187 | ctx.repo = cgit_get_repoinfo(value); |
186 | } else if (!strcmp(name, "p")) { |
188 | } else if (!strcmp(name, "p")) { |
187 | ctx.qry.page = xstrdup(value); |
189 | ctx.qry.page = xstrdup(value); |
188 | } else if (!strcmp(name, "url")) { |
190 | } else if (!strcmp(name, "url")) { |
189 | ctx.qry.url = xstrdup(value); |
191 | ctx.qry.url = xstrdup(value); |
190 | cgit_parse_url(value); |
192 | cgit_parse_url(value); |
191 | } else if (!strcmp(name, "qt")) { |
193 | } else if (!strcmp(name, "qt")) { |
192 | ctx.qry.grep = xstrdup(value); |
194 | ctx.qry.grep = xstrdup(value); |
193 | } else if (!strcmp(name, "q")) { |
195 | } else if (!strcmp(name, "q")) { |
194 | ctx.qry.search = xstrdup(value); |
196 | ctx.qry.search = xstrdup(value); |
195 | } else if (!strcmp(name, "h")) { |
197 | } else if (!strcmp(name, "h")) { |
196 | ctx.qry.head = xstrdup(value); |
198 | ctx.qry.head = xstrdup(value); |
197 | ctx.qry.has_symref = 1; |
199 | ctx.qry.has_symref = 1; |
198 | } else if (!strcmp(name, "id")) { |
200 | } else if (!strcmp(name, "id")) { |
199 | ctx.qry.sha1 = xstrdup(value); |
201 | ctx.qry.sha1 = xstrdup(value); |
200 | ctx.qry.has_sha1 = 1; |
202 | ctx.qry.has_sha1 = 1; |
201 | } else if (!strcmp(name, "id2")) { |
203 | } else if (!strcmp(name, "id2")) { |
202 | ctx.qry.sha2 = xstrdup(value); |
204 | ctx.qry.sha2 = xstrdup(value); |
|