author | Lars Hjemli <hjemli@gmail.com> | 2010-08-21 13:44:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:35:56 (UTC) |
commit | 797110e39d5d433638c82cf27d584ed9b8b93bb7 (patch) (unidiff) | |
tree | cead7ef38aec7dfa76603870b4734ab403405d32 /cgit.c | |
parent | 6d7552bc072599313ef423d69156d824c075572a (diff) | |
download | cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.zip cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.tar.gz cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.tar.bz2 |
Add support for 'section-from-path' option
This option can be used to autogenerate section names during scan-path
processing.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -102,192 +102,194 @@ void config_cb(const char *name, const char *value) | |||
102 | else if (!strcmp(name, "root-desc")) | 102 | else if (!strcmp(name, "root-desc")) |
103 | ctx.cfg.root_desc = xstrdup(value); | 103 | ctx.cfg.root_desc = xstrdup(value); |
104 | else if (!strcmp(name, "root-readme")) | 104 | else if (!strcmp(name, "root-readme")) |
105 | ctx.cfg.root_readme = xstrdup(value); | 105 | ctx.cfg.root_readme = xstrdup(value); |
106 | else if (!strcmp(name, "css")) | 106 | else if (!strcmp(name, "css")) |
107 | ctx.cfg.css = xstrdup(value); | 107 | ctx.cfg.css = xstrdup(value); |
108 | else if (!strcmp(name, "favicon")) | 108 | else if (!strcmp(name, "favicon")) |
109 | ctx.cfg.favicon = xstrdup(value); | 109 | ctx.cfg.favicon = xstrdup(value); |
110 | else if (!strcmp(name, "footer")) | 110 | else if (!strcmp(name, "footer")) |
111 | ctx.cfg.footer = xstrdup(value); | 111 | ctx.cfg.footer = xstrdup(value); |
112 | else if (!strcmp(name, "head-include")) | 112 | else if (!strcmp(name, "head-include")) |
113 | ctx.cfg.head_include = xstrdup(value); | 113 | ctx.cfg.head_include = xstrdup(value); |
114 | else if (!strcmp(name, "header")) | 114 | else if (!strcmp(name, "header")) |
115 | ctx.cfg.header = xstrdup(value); | 115 | ctx.cfg.header = xstrdup(value); |
116 | else if (!strcmp(name, "logo")) | 116 | else if (!strcmp(name, "logo")) |
117 | ctx.cfg.logo = xstrdup(value); | 117 | ctx.cfg.logo = xstrdup(value); |
118 | else if (!strcmp(name, "index-header")) | 118 | else if (!strcmp(name, "index-header")) |
119 | ctx.cfg.index_header = xstrdup(value); | 119 | ctx.cfg.index_header = xstrdup(value); |
120 | else if (!strcmp(name, "index-info")) | 120 | else if (!strcmp(name, "index-info")) |
121 | ctx.cfg.index_info = xstrdup(value); | 121 | ctx.cfg.index_info = xstrdup(value); |
122 | else if (!strcmp(name, "logo-link")) | 122 | else if (!strcmp(name, "logo-link")) |
123 | ctx.cfg.logo_link = xstrdup(value); | 123 | ctx.cfg.logo_link = xstrdup(value); |
124 | else if (!strcmp(name, "module-link")) | 124 | else if (!strcmp(name, "module-link")) |
125 | ctx.cfg.module_link = xstrdup(value); | 125 | ctx.cfg.module_link = xstrdup(value); |
126 | else if (!strcmp(name, "virtual-root")) { | 126 | else if (!strcmp(name, "virtual-root")) { |
127 | ctx.cfg.virtual_root = trim_end(value, '/'); | 127 | ctx.cfg.virtual_root = trim_end(value, '/'); |
128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
129 | ctx.cfg.virtual_root = ""; | 129 | ctx.cfg.virtual_root = ""; |
130 | } else if (!strcmp(name, "nocache")) | 130 | } else if (!strcmp(name, "nocache")) |
131 | ctx.cfg.nocache = atoi(value); | 131 | ctx.cfg.nocache = atoi(value); |
132 | else if (!strcmp(name, "noplainemail")) | 132 | else if (!strcmp(name, "noplainemail")) |
133 | ctx.cfg.noplainemail = atoi(value); | 133 | ctx.cfg.noplainemail = atoi(value); |
134 | else if (!strcmp(name, "noheader")) | 134 | else if (!strcmp(name, "noheader")) |
135 | ctx.cfg.noheader = atoi(value); | 135 | ctx.cfg.noheader = atoi(value); |
136 | else if (!strcmp(name, "snapshots")) | 136 | else if (!strcmp(name, "snapshots")) |
137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
138 | else if (!strcmp(name, "enable-filter-overrides")) | 138 | else if (!strcmp(name, "enable-filter-overrides")) |
139 | ctx.cfg.enable_filter_overrides = atoi(value); | 139 | ctx.cfg.enable_filter_overrides = atoi(value); |
140 | else if (!strcmp(name, "enable-gitweb-owner")) | 140 | else if (!strcmp(name, "enable-gitweb-owner")) |
141 | ctx.cfg.enable_gitweb_owner = atoi(value); | 141 | ctx.cfg.enable_gitweb_owner = atoi(value); |
142 | else if (!strcmp(name, "enable-index-links")) | 142 | else if (!strcmp(name, "enable-index-links")) |
143 | ctx.cfg.enable_index_links = atoi(value); | 143 | ctx.cfg.enable_index_links = atoi(value); |
144 | else if (!strcmp(name, "enable-log-filecount")) | 144 | else if (!strcmp(name, "enable-log-filecount")) |
145 | ctx.cfg.enable_log_filecount = atoi(value); | 145 | ctx.cfg.enable_log_filecount = atoi(value); |
146 | else if (!strcmp(name, "enable-log-linecount")) | 146 | else if (!strcmp(name, "enable-log-linecount")) |
147 | ctx.cfg.enable_log_linecount = atoi(value); | 147 | ctx.cfg.enable_log_linecount = atoi(value); |
148 | else if (!strcmp(name, "enable-remote-branches")) | 148 | else if (!strcmp(name, "enable-remote-branches")) |
149 | ctx.cfg.enable_remote_branches = atoi(value); | 149 | ctx.cfg.enable_remote_branches = atoi(value); |
150 | else if (!strcmp(name, "enable-subject-links")) | 150 | else if (!strcmp(name, "enable-subject-links")) |
151 | ctx.cfg.enable_subject_links = atoi(value); | 151 | ctx.cfg.enable_subject_links = atoi(value); |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) | 152 | else if (!strcmp(name, "enable-tree-linenumbers")) |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 153 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
154 | else if (!strcmp(name, "max-stats")) | 154 | else if (!strcmp(name, "max-stats")) |
155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
156 | else if (!strcmp(name, "cache-size")) | 156 | else if (!strcmp(name, "cache-size")) |
157 | ctx.cfg.cache_size = atoi(value); | 157 | ctx.cfg.cache_size = atoi(value); |
158 | else if (!strcmp(name, "cache-root")) | 158 | else if (!strcmp(name, "cache-root")) |
159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); | 159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
160 | else if (!strcmp(name, "cache-root-ttl")) | 160 | else if (!strcmp(name, "cache-root-ttl")) |
161 | ctx.cfg.cache_root_ttl = atoi(value); | 161 | ctx.cfg.cache_root_ttl = atoi(value); |
162 | else if (!strcmp(name, "cache-repo-ttl")) | 162 | else if (!strcmp(name, "cache-repo-ttl")) |
163 | ctx.cfg.cache_repo_ttl = atoi(value); | 163 | ctx.cfg.cache_repo_ttl = atoi(value); |
164 | else if (!strcmp(name, "cache-scanrc-ttl")) | 164 | else if (!strcmp(name, "cache-scanrc-ttl")) |
165 | ctx.cfg.cache_scanrc_ttl = atoi(value); | 165 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
166 | else if (!strcmp(name, "cache-static-ttl")) | 166 | else if (!strcmp(name, "cache-static-ttl")) |
167 | ctx.cfg.cache_static_ttl = atoi(value); | 167 | ctx.cfg.cache_static_ttl = atoi(value); |
168 | else if (!strcmp(name, "cache-dynamic-ttl")) | 168 | else if (!strcmp(name, "cache-dynamic-ttl")) |
169 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 169 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
170 | else if (!strcmp(name, "about-filter")) | 170 | else if (!strcmp(name, "about-filter")) |
171 | ctx.cfg.about_filter = new_filter(value, 0); | 171 | ctx.cfg.about_filter = new_filter(value, 0); |
172 | else if (!strcmp(name, "commit-filter")) | 172 | else if (!strcmp(name, "commit-filter")) |
173 | ctx.cfg.commit_filter = new_filter(value, 0); | 173 | ctx.cfg.commit_filter = new_filter(value, 0); |
174 | else if (!strcmp(name, "embedded")) | 174 | else if (!strcmp(name, "embedded")) |
175 | ctx.cfg.embedded = atoi(value); | 175 | ctx.cfg.embedded = atoi(value); |
176 | else if (!strcmp(name, "max-atom-items")) | 176 | else if (!strcmp(name, "max-atom-items")) |
177 | ctx.cfg.max_atom_items = atoi(value); | 177 | ctx.cfg.max_atom_items = atoi(value); |
178 | else if (!strcmp(name, "max-message-length")) | 178 | else if (!strcmp(name, "max-message-length")) |
179 | ctx.cfg.max_msg_len = atoi(value); | 179 | ctx.cfg.max_msg_len = atoi(value); |
180 | else if (!strcmp(name, "max-repodesc-length")) | 180 | else if (!strcmp(name, "max-repodesc-length")) |
181 | ctx.cfg.max_repodesc_len = atoi(value); | 181 | ctx.cfg.max_repodesc_len = atoi(value); |
182 | else if (!strcmp(name, "max-blob-size")) | 182 | else if (!strcmp(name, "max-blob-size")) |
183 | ctx.cfg.max_blob_size = atoi(value); | 183 | ctx.cfg.max_blob_size = atoi(value); |
184 | else if (!strcmp(name, "max-repo-count")) | 184 | else if (!strcmp(name, "max-repo-count")) |
185 | ctx.cfg.max_repo_count = atoi(value); | 185 | ctx.cfg.max_repo_count = atoi(value); |
186 | else if (!strcmp(name, "max-commit-count")) | 186 | else if (!strcmp(name, "max-commit-count")) |
187 | ctx.cfg.max_commit_count = atoi(value); | 187 | ctx.cfg.max_commit_count = atoi(value); |
188 | else if (!strcmp(name, "project-list")) | 188 | else if (!strcmp(name, "project-list")) |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
190 | else if (!strcmp(name, "scan-path")) | 190 | else if (!strcmp(name, "scan-path")) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
192 | process_cached_repolist(expand_macros(value)); | 192 | process_cached_repolist(expand_macros(value)); |
193 | else if (ctx.cfg.project_list) | 193 | else if (ctx.cfg.project_list) |
194 | scan_projects(expand_macros(value), | 194 | scan_projects(expand_macros(value), |
195 | ctx.cfg.project_list, repo_config); | 195 | ctx.cfg.project_list, repo_config); |
196 | else | 196 | else |
197 | scan_tree(expand_macros(value), repo_config); | 197 | scan_tree(expand_macros(value), repo_config); |
198 | else if (!strcmp(name, "section-from-path")) | ||
199 | ctx.cfg.section_from_path = atoi(value); | ||
198 | else if (!strcmp(name, "source-filter")) | 200 | else if (!strcmp(name, "source-filter")) |
199 | ctx.cfg.source_filter = new_filter(value, 1); | 201 | ctx.cfg.source_filter = new_filter(value, 1); |
200 | else if (!strcmp(name, "summary-log")) | 202 | else if (!strcmp(name, "summary-log")) |
201 | ctx.cfg.summary_log = atoi(value); | 203 | ctx.cfg.summary_log = atoi(value); |
202 | else if (!strcmp(name, "summary-branches")) | 204 | else if (!strcmp(name, "summary-branches")) |
203 | ctx.cfg.summary_branches = atoi(value); | 205 | ctx.cfg.summary_branches = atoi(value); |
204 | else if (!strcmp(name, "summary-tags")) | 206 | else if (!strcmp(name, "summary-tags")) |
205 | ctx.cfg.summary_tags = atoi(value); | 207 | ctx.cfg.summary_tags = atoi(value); |
206 | else if (!strcmp(name, "side-by-side-diffs")) | 208 | else if (!strcmp(name, "side-by-side-diffs")) |
207 | ctx.cfg.ssdiff = atoi(value); | 209 | ctx.cfg.ssdiff = atoi(value); |
208 | else if (!strcmp(name, "agefile")) | 210 | else if (!strcmp(name, "agefile")) |
209 | ctx.cfg.agefile = xstrdup(value); | 211 | ctx.cfg.agefile = xstrdup(value); |
210 | else if (!strcmp(name, "renamelimit")) | 212 | else if (!strcmp(name, "renamelimit")) |
211 | ctx.cfg.renamelimit = atoi(value); | 213 | ctx.cfg.renamelimit = atoi(value); |
212 | else if (!strcmp(name, "remove-suffix")) | 214 | else if (!strcmp(name, "remove-suffix")) |
213 | ctx.cfg.remove_suffix = atoi(value); | 215 | ctx.cfg.remove_suffix = atoi(value); |
214 | else if (!strcmp(name, "robots")) | 216 | else if (!strcmp(name, "robots")) |
215 | ctx.cfg.robots = xstrdup(value); | 217 | ctx.cfg.robots = xstrdup(value); |
216 | else if (!strcmp(name, "clone-prefix")) | 218 | else if (!strcmp(name, "clone-prefix")) |
217 | ctx.cfg.clone_prefix = xstrdup(value); | 219 | ctx.cfg.clone_prefix = xstrdup(value); |
218 | else if (!strcmp(name, "local-time")) | 220 | else if (!strcmp(name, "local-time")) |
219 | ctx.cfg.local_time = atoi(value); | 221 | ctx.cfg.local_time = atoi(value); |
220 | else if (!prefixcmp(name, "mimetype.")) | 222 | else if (!prefixcmp(name, "mimetype.")) |
221 | add_mimetype(name + 9, value); | 223 | add_mimetype(name + 9, value); |
222 | else if (!strcmp(name, "include")) | 224 | else if (!strcmp(name, "include")) |
223 | parse_configfile(expand_macros(value), config_cb); | 225 | parse_configfile(expand_macros(value), config_cb); |
224 | } | 226 | } |
225 | 227 | ||
226 | static void querystring_cb(const char *name, const char *value) | 228 | static void querystring_cb(const char *name, const char *value) |
227 | { | 229 | { |
228 | if (!value) | 230 | if (!value) |
229 | value = ""; | 231 | value = ""; |
230 | 232 | ||
231 | if (!strcmp(name,"r")) { | 233 | if (!strcmp(name,"r")) { |
232 | ctx.qry.repo = xstrdup(value); | 234 | ctx.qry.repo = xstrdup(value); |
233 | ctx.repo = cgit_get_repoinfo(value); | 235 | ctx.repo = cgit_get_repoinfo(value); |
234 | } else if (!strcmp(name, "p")) { | 236 | } else if (!strcmp(name, "p")) { |
235 | ctx.qry.page = xstrdup(value); | 237 | ctx.qry.page = xstrdup(value); |
236 | } else if (!strcmp(name, "url")) { | 238 | } else if (!strcmp(name, "url")) { |
237 | if (*value == '/') | 239 | if (*value == '/') |
238 | value++; | 240 | value++; |
239 | ctx.qry.url = xstrdup(value); | 241 | ctx.qry.url = xstrdup(value); |
240 | cgit_parse_url(value); | 242 | cgit_parse_url(value); |
241 | } else if (!strcmp(name, "qt")) { | 243 | } else if (!strcmp(name, "qt")) { |
242 | ctx.qry.grep = xstrdup(value); | 244 | ctx.qry.grep = xstrdup(value); |
243 | } else if (!strcmp(name, "q")) { | 245 | } else if (!strcmp(name, "q")) { |
244 | ctx.qry.search = xstrdup(value); | 246 | ctx.qry.search = xstrdup(value); |
245 | } else if (!strcmp(name, "h")) { | 247 | } else if (!strcmp(name, "h")) { |
246 | ctx.qry.head = xstrdup(value); | 248 | ctx.qry.head = xstrdup(value); |
247 | ctx.qry.has_symref = 1; | 249 | ctx.qry.has_symref = 1; |
248 | } else if (!strcmp(name, "id")) { | 250 | } else if (!strcmp(name, "id")) { |
249 | ctx.qry.sha1 = xstrdup(value); | 251 | ctx.qry.sha1 = xstrdup(value); |
250 | ctx.qry.has_sha1 = 1; | 252 | ctx.qry.has_sha1 = 1; |
251 | } else if (!strcmp(name, "id2")) { | 253 | } else if (!strcmp(name, "id2")) { |
252 | ctx.qry.sha2 = xstrdup(value); | 254 | ctx.qry.sha2 = xstrdup(value); |
253 | ctx.qry.has_sha1 = 1; | 255 | ctx.qry.has_sha1 = 1; |
254 | } else if (!strcmp(name, "ofs")) { | 256 | } else if (!strcmp(name, "ofs")) { |
255 | ctx.qry.ofs = atoi(value); | 257 | ctx.qry.ofs = atoi(value); |
256 | } else if (!strcmp(name, "path")) { | 258 | } else if (!strcmp(name, "path")) { |
257 | ctx.qry.path = trim_end(value, '/'); | 259 | ctx.qry.path = trim_end(value, '/'); |
258 | } else if (!strcmp(name, "name")) { | 260 | } else if (!strcmp(name, "name")) { |
259 | ctx.qry.name = xstrdup(value); | 261 | ctx.qry.name = xstrdup(value); |
260 | } else if (!strcmp(name, "mimetype")) { | 262 | } else if (!strcmp(name, "mimetype")) { |
261 | ctx.qry.mimetype = xstrdup(value); | 263 | ctx.qry.mimetype = xstrdup(value); |
262 | } else if (!strcmp(name, "s")){ | 264 | } else if (!strcmp(name, "s")){ |
263 | ctx.qry.sort = xstrdup(value); | 265 | ctx.qry.sort = xstrdup(value); |
264 | } else if (!strcmp(name, "showmsg")) { | 266 | } else if (!strcmp(name, "showmsg")) { |
265 | ctx.qry.showmsg = atoi(value); | 267 | ctx.qry.showmsg = atoi(value); |
266 | } else if (!strcmp(name, "period")) { | 268 | } else if (!strcmp(name, "period")) { |
267 | ctx.qry.period = xstrdup(value); | 269 | ctx.qry.period = xstrdup(value); |
268 | } else if (!strcmp(name, "ss")) { | 270 | } else if (!strcmp(name, "ss")) { |
269 | ctx.qry.ssdiff = atoi(value); | 271 | ctx.qry.ssdiff = atoi(value); |
270 | } else if (!strcmp(name, "all")) { | 272 | } else if (!strcmp(name, "all")) { |
271 | ctx.qry.show_all = atoi(value); | 273 | ctx.qry.show_all = atoi(value); |
272 | } else if (!strcmp(name, "context")) { | 274 | } else if (!strcmp(name, "context")) { |
273 | ctx.qry.context = atoi(value); | 275 | ctx.qry.context = atoi(value); |
274 | } else if (!strcmp(name, "ignorews")) { | 276 | } else if (!strcmp(name, "ignorews")) { |
275 | ctx.qry.ignorews = atoi(value); | 277 | ctx.qry.ignorews = atoi(value); |
276 | } | 278 | } |
277 | } | 279 | } |
278 | 280 | ||
279 | char *xstrdupn(const char *str) | 281 | char *xstrdupn(const char *str) |
280 | { | 282 | { |
281 | return (str ? xstrdup(str) : NULL); | 283 | return (str ? xstrdup(str) : NULL); |
282 | } | 284 | } |
283 | 285 | ||
284 | static void prepare_context(struct cgit_context *ctx) | 286 | static void prepare_context(struct cgit_context *ctx) |
285 | { | 287 | { |
286 | memset(ctx, 0, sizeof(*ctx)); | 288 | memset(ctx, 0, sizeof(*ctx)); |
287 | ctx->cfg.agefile = "info/web/last-modified"; | 289 | ctx->cfg.agefile = "info/web/last-modified"; |
288 | ctx->cfg.nocache = 0; | 290 | ctx->cfg.nocache = 0; |
289 | ctx->cfg.cache_size = 0; | 291 | ctx->cfg.cache_size = 0; |
290 | ctx->cfg.cache_dynamic_ttl = 5; | 292 | ctx->cfg.cache_dynamic_ttl = 5; |
291 | ctx->cfg.cache_max_create_time = 5; | 293 | ctx->cfg.cache_max_create_time = 5; |
292 | ctx->cfg.cache_repo_ttl = 5; | 294 | ctx->cfg.cache_repo_ttl = 5; |
293 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 295 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |