author | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:11:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:11:36 (UTC) |
commit | e87e89633383b8b75c68c98be3e0c14212109de2 (patch) (unidiff) | |
tree | f57e131ab854b58023387aee8efc0e4ee54653b5 /cgit.c | |
parent | 20a33548b9a87a6eb23162ee5d137daa46d78613 (diff) | |
download | cgit-e87e89633383b8b75c68c98be3e0c14212109de2.zip cgit-e87e89633383b8b75c68c98be3e0c14212109de2.tar.gz cgit-e87e89633383b8b75c68c98be3e0c14212109de2.tar.bz2 |
Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
This is a generic http-function.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,24 +1,25 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | ||
13 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
14 | 15 | ||
15 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
16 | 17 | ||
17 | void config_cb(const char *name, const char *value) | 18 | void config_cb(const char *name, const char *value) |
18 | { | 19 | { |
19 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
20 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
21 | else if (!strcmp(name, "css")) | 22 | else if (!strcmp(name, "css")) |
22 | ctx.cfg.css = xstrdup(value); | 23 | ctx.cfg.css = xstrdup(value); |
23 | else if (!strcmp(name, "logo")) | 24 | else if (!strcmp(name, "logo")) |
24 | ctx.cfg.logo = xstrdup(value); | 25 | ctx.cfg.logo = xstrdup(value); |
@@ -435,23 +436,23 @@ int main(int argc, const char **argv) | |||
435 | item.st.st_mtime = time(NULL); | 436 | item.st.st_mtime = time(NULL); |
436 | cgit_repolist.length = 0; | 437 | cgit_repolist.length = 0; |
437 | cgit_repolist.count = 0; | 438 | cgit_repolist.count = 0; |
438 | cgit_repolist.repos = NULL; | 439 | cgit_repolist.repos = NULL; |
439 | 440 | ||
440 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 441 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
441 | config_cb); | 442 | config_cb); |
442 | if (getenv("SCRIPT_NAME")) | 443 | if (getenv("SCRIPT_NAME")) |
443 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 444 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
444 | if (getenv("QUERY_STRING")) | 445 | if (getenv("QUERY_STRING")) |
445 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 446 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
446 | cgit_parse_args(argc, argv); | 447 | cgit_parse_args(argc, argv); |
447 | cgit_parse_query(ctx.qry.raw, querystring_cb); | 448 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
448 | if (!cgit_prepare_cache(&item)) | 449 | if (!cgit_prepare_cache(&item)) |
449 | return 0; | 450 | return 0; |
450 | if (ctx.cfg.nocache) { | 451 | if (ctx.cfg.nocache) { |
451 | cgit_fill_cache(&item, 0); | 452 | cgit_fill_cache(&item, 0); |
452 | } else { | 453 | } else { |
453 | cgit_check_cache(&item); | 454 | cgit_check_cache(&item); |
454 | cgit_print_cache(&item); | 455 | cgit_print_cache(&item); |
455 | } | 456 | } |
456 | return 0; | 457 | return 0; |
457 | } | 458 | } |