author | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 05:42:03 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:58 (UTC) |
commit | e01229cf80bc618a132d2154c0ebd71792d31c64 (patch) (unidiff) | |
tree | 62aa3f02166f7f4b6cdf866a4916b53921ed3ecf /cgit.c | |
parent | 74061ed5f03e72796450aa3b8ca1cf6ced5d59e2 (diff) | |
download | cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.zip cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.tar.gz cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.tar.bz2 |
ui-repolist: handle empty sections similar to NULL sections
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -208,128 +208,129 @@ static void querystring_cb(const char *name, const char *value) | |||
208 | cgit_parse_url(value); | 208 | cgit_parse_url(value); |
209 | } else if (!strcmp(name, "qt")) { | 209 | } else if (!strcmp(name, "qt")) { |
210 | ctx.qry.grep = xstrdup(value); | 210 | ctx.qry.grep = xstrdup(value); |
211 | } else if (!strcmp(name, "q")) { | 211 | } else if (!strcmp(name, "q")) { |
212 | ctx.qry.search = xstrdup(value); | 212 | ctx.qry.search = xstrdup(value); |
213 | } else if (!strcmp(name, "h")) { | 213 | } else if (!strcmp(name, "h")) { |
214 | ctx.qry.head = xstrdup(value); | 214 | ctx.qry.head = xstrdup(value); |
215 | ctx.qry.has_symref = 1; | 215 | ctx.qry.has_symref = 1; |
216 | } else if (!strcmp(name, "id")) { | 216 | } else if (!strcmp(name, "id")) { |
217 | ctx.qry.sha1 = xstrdup(value); | 217 | ctx.qry.sha1 = xstrdup(value); |
218 | ctx.qry.has_sha1 = 1; | 218 | ctx.qry.has_sha1 = 1; |
219 | } else if (!strcmp(name, "id2")) { | 219 | } else if (!strcmp(name, "id2")) { |
220 | ctx.qry.sha2 = xstrdup(value); | 220 | ctx.qry.sha2 = xstrdup(value); |
221 | ctx.qry.has_sha1 = 1; | 221 | ctx.qry.has_sha1 = 1; |
222 | } else if (!strcmp(name, "ofs")) { | 222 | } else if (!strcmp(name, "ofs")) { |
223 | ctx.qry.ofs = atoi(value); | 223 | ctx.qry.ofs = atoi(value); |
224 | } else if (!strcmp(name, "path")) { | 224 | } else if (!strcmp(name, "path")) { |
225 | ctx.qry.path = trim_end(value, '/'); | 225 | ctx.qry.path = trim_end(value, '/'); |
226 | } else if (!strcmp(name, "name")) { | 226 | } else if (!strcmp(name, "name")) { |
227 | ctx.qry.name = xstrdup(value); | 227 | ctx.qry.name = xstrdup(value); |
228 | } else if (!strcmp(name, "mimetype")) { | 228 | } else if (!strcmp(name, "mimetype")) { |
229 | ctx.qry.mimetype = xstrdup(value); | 229 | ctx.qry.mimetype = xstrdup(value); |
230 | } else if (!strcmp(name, "s")){ | 230 | } else if (!strcmp(name, "s")){ |
231 | ctx.qry.sort = xstrdup(value); | 231 | ctx.qry.sort = xstrdup(value); |
232 | } else if (!strcmp(name, "showmsg")) { | 232 | } else if (!strcmp(name, "showmsg")) { |
233 | ctx.qry.showmsg = atoi(value); | 233 | ctx.qry.showmsg = atoi(value); |
234 | } else if (!strcmp(name, "period")) { | 234 | } else if (!strcmp(name, "period")) { |
235 | ctx.qry.period = xstrdup(value); | 235 | ctx.qry.period = xstrdup(value); |
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | char *xstrdupn(const char *str) | 239 | char *xstrdupn(const char *str) |
240 | { | 240 | { |
241 | return (str ? xstrdup(str) : NULL); | 241 | return (str ? xstrdup(str) : NULL); |
242 | } | 242 | } |
243 | 243 | ||
244 | static void prepare_context(struct cgit_context *ctx) | 244 | static void prepare_context(struct cgit_context *ctx) |
245 | { | 245 | { |
246 | memset(ctx, 0, sizeof(ctx)); | 246 | memset(ctx, 0, sizeof(ctx)); |
247 | ctx->cfg.agefile = "info/web/last-modified"; | 247 | ctx->cfg.agefile = "info/web/last-modified"; |
248 | ctx->cfg.nocache = 0; | 248 | ctx->cfg.nocache = 0; |
249 | ctx->cfg.cache_size = 0; | 249 | ctx->cfg.cache_size = 0; |
250 | ctx->cfg.cache_dynamic_ttl = 5; | 250 | ctx->cfg.cache_dynamic_ttl = 5; |
251 | ctx->cfg.cache_max_create_time = 5; | 251 | ctx->cfg.cache_max_create_time = 5; |
252 | ctx->cfg.cache_repo_ttl = 5; | 252 | ctx->cfg.cache_repo_ttl = 5; |
253 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 253 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
254 | ctx->cfg.cache_root_ttl = 5; | 254 | ctx->cfg.cache_root_ttl = 5; |
255 | ctx->cfg.cache_scanrc_ttl = 15; | 255 | ctx->cfg.cache_scanrc_ttl = 15; |
256 | ctx->cfg.cache_static_ttl = -1; | 256 | ctx->cfg.cache_static_ttl = -1; |
257 | ctx->cfg.css = "/cgit.css"; | 257 | ctx->cfg.css = "/cgit.css"; |
258 | ctx->cfg.logo = "/cgit.png"; | 258 | ctx->cfg.logo = "/cgit.png"; |
259 | ctx->cfg.local_time = 0; | 259 | ctx->cfg.local_time = 0; |
260 | ctx->cfg.max_repo_count = 50; | 260 | ctx->cfg.max_repo_count = 50; |
261 | ctx->cfg.max_commit_count = 50; | 261 | ctx->cfg.max_commit_count = 50; |
262 | ctx->cfg.max_lock_attempts = 5; | 262 | ctx->cfg.max_lock_attempts = 5; |
263 | ctx->cfg.max_msg_len = 80; | 263 | ctx->cfg.max_msg_len = 80; |
264 | ctx->cfg.max_repodesc_len = 80; | 264 | ctx->cfg.max_repodesc_len = 80; |
265 | ctx->cfg.max_stats = 0; | 265 | ctx->cfg.max_stats = 0; |
266 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 266 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
267 | ctx->cfg.renamelimit = -1; | 267 | ctx->cfg.renamelimit = -1; |
268 | ctx->cfg.robots = "index, nofollow"; | 268 | ctx->cfg.robots = "index, nofollow"; |
269 | ctx->cfg.root_title = "Git repository browser"; | 269 | ctx->cfg.root_title = "Git repository browser"; |
270 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 270 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
271 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 271 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
272 | ctx->cfg.section = ""; | ||
272 | ctx->cfg.summary_branches = 10; | 273 | ctx->cfg.summary_branches = 10; |
273 | ctx->cfg.summary_log = 10; | 274 | ctx->cfg.summary_log = 10; |
274 | ctx->cfg.summary_tags = 10; | 275 | ctx->cfg.summary_tags = 10; |
275 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 276 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
276 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 277 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
277 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 278 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
278 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 279 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
279 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 280 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
280 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 281 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
281 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 282 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
282 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 283 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
283 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 284 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
284 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 285 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
285 | ctx->page.mimetype = "text/html"; | 286 | ctx->page.mimetype = "text/html"; |
286 | ctx->page.charset = PAGE_ENCODING; | 287 | ctx->page.charset = PAGE_ENCODING; |
287 | ctx->page.filename = NULL; | 288 | ctx->page.filename = NULL; |
288 | ctx->page.size = 0; | 289 | ctx->page.size = 0; |
289 | ctx->page.modified = time(NULL); | 290 | ctx->page.modified = time(NULL); |
290 | ctx->page.expires = ctx->page.modified; | 291 | ctx->page.expires = ctx->page.modified; |
291 | ctx->page.etag = NULL; | 292 | ctx->page.etag = NULL; |
292 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 293 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
293 | if (ctx->env.script_name) | 294 | if (ctx->env.script_name) |
294 | ctx->cfg.script_name = ctx->env.script_name; | 295 | ctx->cfg.script_name = ctx->env.script_name; |
295 | if (ctx->env.query_string) | 296 | if (ctx->env.query_string) |
296 | ctx->qry.raw = ctx->env.query_string; | 297 | ctx->qry.raw = ctx->env.query_string; |
297 | if (!ctx->env.cgit_config) | 298 | if (!ctx->env.cgit_config) |
298 | ctx->env.cgit_config = CGIT_CONFIG; | 299 | ctx->env.cgit_config = CGIT_CONFIG; |
299 | } | 300 | } |
300 | 301 | ||
301 | struct refmatch { | 302 | struct refmatch { |
302 | char *req_ref; | 303 | char *req_ref; |
303 | char *first_ref; | 304 | char *first_ref; |
304 | int match; | 305 | int match; |
305 | }; | 306 | }; |
306 | 307 | ||
307 | int find_current_ref(const char *refname, const unsigned char *sha1, | 308 | int find_current_ref(const char *refname, const unsigned char *sha1, |
308 | int flags, void *cb_data) | 309 | int flags, void *cb_data) |
309 | { | 310 | { |
310 | struct refmatch *info; | 311 | struct refmatch *info; |
311 | 312 | ||
312 | info = (struct refmatch *)cb_data; | 313 | info = (struct refmatch *)cb_data; |
313 | if (!strcmp(refname, info->req_ref)) | 314 | if (!strcmp(refname, info->req_ref)) |
314 | info->match = 1; | 315 | info->match = 1; |
315 | if (!info->first_ref) | 316 | if (!info->first_ref) |
316 | info->first_ref = xstrdup(refname); | 317 | info->first_ref = xstrdup(refname); |
317 | return info->match; | 318 | return info->match; |
318 | } | 319 | } |
319 | 320 | ||
320 | char *find_default_branch(struct cgit_repo *repo) | 321 | char *find_default_branch(struct cgit_repo *repo) |
321 | { | 322 | { |
322 | struct refmatch info; | 323 | struct refmatch info; |
323 | char *ref; | 324 | char *ref; |
324 | 325 | ||
325 | info.req_ref = repo->defbranch; | 326 | info.req_ref = repo->defbranch; |
326 | info.first_ref = NULL; | 327 | info.first_ref = NULL; |
327 | info.match = 0; | 328 | info.match = 0; |
328 | for_each_branch_ref(find_current_ref, &info); | 329 | for_each_branch_ref(find_current_ref, &info); |
329 | if (info.match) | 330 | if (info.match) |
330 | ref = info.req_ref; | 331 | ref = info.req_ref; |
331 | else | 332 | else |
332 | ref = info.first_ref; | 333 | ref = info.first_ref; |
333 | if (ref) | 334 | if (ref) |
334 | ref = xstrdup(ref); | 335 | ref = xstrdup(ref); |
335 | return ref; | 336 | return ref; |