author | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-27 23:09:11 (UTC) |
commit | 20a33548b9a87a6eb23162ee5d137daa46d78613 (patch) (unidiff) | |
tree | 9c4ca364df64dcce640a531c7f515ee48bc99387 /cgit.c | |
parent | ee4056bd2c902a12dea67874368863fe60ea5a5f (diff) | |
download | cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.zip cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.gz cgit-20a33548b9a87a6eb23162ee5d137daa46d78613.tar.bz2 |
Move function for configfile parsing into configfile.[ch]
This is a generic function which wanted its own little object file.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,43 +1,44 @@ | |||
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 "ui-shared.h" | 13 | #include "ui-shared.h" |
13 | 14 | ||
14 | const char *cgit_version = CGIT_VERSION; | 15 | const char *cgit_version = CGIT_VERSION; |
15 | 16 | ||
16 | void config_cb(const char *name, const char *value) | 17 | void config_cb(const char *name, const char *value) |
17 | { | 18 | { |
18 | if (!strcmp(name, "root-title")) | 19 | if (!strcmp(name, "root-title")) |
19 | ctx.cfg.root_title = xstrdup(value); | 20 | ctx.cfg.root_title = xstrdup(value); |
20 | else if (!strcmp(name, "css")) | 21 | else if (!strcmp(name, "css")) |
21 | ctx.cfg.css = xstrdup(value); | 22 | ctx.cfg.css = xstrdup(value); |
22 | else if (!strcmp(name, "logo")) | 23 | else if (!strcmp(name, "logo")) |
23 | ctx.cfg.logo = xstrdup(value); | 24 | ctx.cfg.logo = xstrdup(value); |
24 | else if (!strcmp(name, "index-header")) | 25 | else if (!strcmp(name, "index-header")) |
25 | ctx.cfg.index_header = xstrdup(value); | 26 | ctx.cfg.index_header = xstrdup(value); |
26 | else if (!strcmp(name, "index-info")) | 27 | else if (!strcmp(name, "index-info")) |
27 | ctx.cfg.index_info = xstrdup(value); | 28 | ctx.cfg.index_info = xstrdup(value); |
28 | else if (!strcmp(name, "logo-link")) | 29 | else if (!strcmp(name, "logo-link")) |
29 | ctx.cfg.logo_link = xstrdup(value); | 30 | ctx.cfg.logo_link = xstrdup(value); |
30 | else if (!strcmp(name, "module-link")) | 31 | else if (!strcmp(name, "module-link")) |
31 | ctx.cfg.module_link = xstrdup(value); | 32 | ctx.cfg.module_link = xstrdup(value); |
32 | else if (!strcmp(name, "virtual-root")) { | 33 | else if (!strcmp(name, "virtual-root")) { |
33 | ctx.cfg.virtual_root = trim_end(value, '/'); | 34 | ctx.cfg.virtual_root = trim_end(value, '/'); |
34 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 35 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
35 | ctx.cfg.virtual_root = ""; | 36 | ctx.cfg.virtual_root = ""; |
36 | } else if (!strcmp(name, "nocache")) | 37 | } else if (!strcmp(name, "nocache")) |
37 | ctx.cfg.nocache = atoi(value); | 38 | ctx.cfg.nocache = atoi(value); |
38 | else if (!strcmp(name, "snapshots")) | 39 | else if (!strcmp(name, "snapshots")) |
39 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 40 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
40 | else if (!strcmp(name, "enable-index-links")) | 41 | else if (!strcmp(name, "enable-index-links")) |
41 | ctx.cfg.enable_index_links = atoi(value); | 42 | ctx.cfg.enable_index_links = atoi(value); |
42 | else if (!strcmp(name, "enable-log-filecount")) | 43 | else if (!strcmp(name, "enable-log-filecount")) |
43 | ctx.cfg.enable_log_filecount = atoi(value); | 44 | ctx.cfg.enable_log_filecount = atoi(value); |
@@ -74,65 +75,65 @@ void config_cb(const char *name, const char *value) | |||
74 | else if (!strcmp(name, "clone-prefix")) | 75 | else if (!strcmp(name, "clone-prefix")) |
75 | ctx.cfg.clone_prefix = xstrdup(value); | 76 | ctx.cfg.clone_prefix = xstrdup(value); |
76 | else if (!strcmp(name, "repo.group")) | 77 | else if (!strcmp(name, "repo.group")) |
77 | ctx.cfg.repo_group = xstrdup(value); | 78 | ctx.cfg.repo_group = xstrdup(value); |
78 | else if (!strcmp(name, "repo.url")) | 79 | else if (!strcmp(name, "repo.url")) |
79 | ctx.repo = cgit_add_repo(value); | 80 | ctx.repo = cgit_add_repo(value); |
80 | else if (!strcmp(name, "repo.name")) | 81 | else if (!strcmp(name, "repo.name")) |
81 | ctx.repo->name = xstrdup(value); | 82 | ctx.repo->name = xstrdup(value); |
82 | else if (ctx.repo && !strcmp(name, "repo.path")) | 83 | else if (ctx.repo && !strcmp(name, "repo.path")) |
83 | ctx.repo->path = trim_end(value, '/'); | 84 | ctx.repo->path = trim_end(value, '/'); |
84 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 85 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
85 | ctx.repo->clone_url = xstrdup(value); | 86 | ctx.repo->clone_url = xstrdup(value); |
86 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 87 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
87 | ctx.repo->desc = xstrdup(value); | 88 | ctx.repo->desc = xstrdup(value); |
88 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 89 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
89 | ctx.repo->owner = xstrdup(value); | 90 | ctx.repo->owner = xstrdup(value); |
90 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 91 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
91 | ctx.repo->defbranch = xstrdup(value); | 92 | ctx.repo->defbranch = xstrdup(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 93 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
93 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 94 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
94 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 95 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
95 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 96 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 97 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
97 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 98 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
98 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 99 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
99 | ctx.repo->module_link= xstrdup(value); | 100 | ctx.repo->module_link= xstrdup(value); |
100 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 101 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
101 | if (*value == '/') | 102 | if (*value == '/') |
102 | ctx.repo->readme = xstrdup(value); | 103 | ctx.repo->readme = xstrdup(value); |
103 | else | 104 | else |
104 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 105 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
105 | } else if (!strcmp(name, "include")) | 106 | } else if (!strcmp(name, "include")) |
106 | cgit_read_config(value, config_cb); | 107 | parse_configfile(value, config_cb); |
107 | } | 108 | } |
108 | 109 | ||
109 | static void querystring_cb(const char *name, const char *value) | 110 | static void querystring_cb(const char *name, const char *value) |
110 | { | 111 | { |
111 | if (!strcmp(name,"r")) { | 112 | if (!strcmp(name,"r")) { |
112 | ctx.qry.repo = xstrdup(value); | 113 | ctx.qry.repo = xstrdup(value); |
113 | ctx.repo = cgit_get_repoinfo(value); | 114 | ctx.repo = cgit_get_repoinfo(value); |
114 | } else if (!strcmp(name, "p")) { | 115 | } else if (!strcmp(name, "p")) { |
115 | ctx.qry.page = xstrdup(value); | 116 | ctx.qry.page = xstrdup(value); |
116 | } else if (!strcmp(name, "url")) { | 117 | } else if (!strcmp(name, "url")) { |
117 | cgit_parse_url(value); | 118 | cgit_parse_url(value); |
118 | } else if (!strcmp(name, "qt")) { | 119 | } else if (!strcmp(name, "qt")) { |
119 | ctx.qry.grep = xstrdup(value); | 120 | ctx.qry.grep = xstrdup(value); |
120 | } else if (!strcmp(name, "q")) { | 121 | } else if (!strcmp(name, "q")) { |
121 | ctx.qry.search = xstrdup(value); | 122 | ctx.qry.search = xstrdup(value); |
122 | } else if (!strcmp(name, "h")) { | 123 | } else if (!strcmp(name, "h")) { |
123 | ctx.qry.head = xstrdup(value); | 124 | ctx.qry.head = xstrdup(value); |
124 | ctx.qry.has_symref = 1; | 125 | ctx.qry.has_symref = 1; |
125 | } else if (!strcmp(name, "id")) { | 126 | } else if (!strcmp(name, "id")) { |
126 | ctx.qry.sha1 = xstrdup(value); | 127 | ctx.qry.sha1 = xstrdup(value); |
127 | ctx.qry.has_sha1 = 1; | 128 | ctx.qry.has_sha1 = 1; |
128 | } else if (!strcmp(name, "id2")) { | 129 | } else if (!strcmp(name, "id2")) { |
129 | ctx.qry.sha2 = xstrdup(value); | 130 | ctx.qry.sha2 = xstrdup(value); |
130 | ctx.qry.has_sha1 = 1; | 131 | ctx.qry.has_sha1 = 1; |
131 | } else if (!strcmp(name, "ofs")) { | 132 | } else if (!strcmp(name, "ofs")) { |
132 | ctx.qry.ofs = atoi(value); | 133 | ctx.qry.ofs = atoi(value); |
133 | } else if (!strcmp(name, "path")) { | 134 | } else if (!strcmp(name, "path")) { |
134 | ctx.qry.path = trim_end(value, '/'); | 135 | ctx.qry.path = trim_end(value, '/'); |
135 | } else if (!strcmp(name, "name")) { | 136 | } else if (!strcmp(name, "name")) { |
136 | ctx.qry.name = xstrdup(value); | 137 | ctx.qry.name = xstrdup(value); |
137 | } | 138 | } |
138 | } | 139 | } |
@@ -407,50 +408,50 @@ static void cgit_parse_args(int argc, const char **argv) | |||
407 | } | 408 | } |
408 | if (!strncmp(argv[i], "--repo=", 7)) { | 409 | if (!strncmp(argv[i], "--repo=", 7)) { |
409 | ctx.qry.repo = xstrdup(argv[i]+7); | 410 | ctx.qry.repo = xstrdup(argv[i]+7); |
410 | } | 411 | } |
411 | if (!strncmp(argv[i], "--page=", 7)) { | 412 | if (!strncmp(argv[i], "--page=", 7)) { |
412 | ctx.qry.page = xstrdup(argv[i]+7); | 413 | ctx.qry.page = xstrdup(argv[i]+7); |
413 | } | 414 | } |
414 | if (!strncmp(argv[i], "--head=", 7)) { | 415 | if (!strncmp(argv[i], "--head=", 7)) { |
415 | ctx.qry.head = xstrdup(argv[i]+7); | 416 | ctx.qry.head = xstrdup(argv[i]+7); |
416 | ctx.qry.has_symref = 1; | 417 | ctx.qry.has_symref = 1; |
417 | } | 418 | } |
418 | if (!strncmp(argv[i], "--sha1=", 7)) { | 419 | if (!strncmp(argv[i], "--sha1=", 7)) { |
419 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 420 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
420 | ctx.qry.has_sha1 = 1; | 421 | ctx.qry.has_sha1 = 1; |
421 | } | 422 | } |
422 | if (!strncmp(argv[i], "--ofs=", 6)) { | 423 | if (!strncmp(argv[i], "--ofs=", 6)) { |
423 | ctx.qry.ofs = atoi(argv[i]+6); | 424 | ctx.qry.ofs = atoi(argv[i]+6); |
424 | } | 425 | } |
425 | } | 426 | } |
426 | } | 427 | } |
427 | 428 | ||
428 | int main(int argc, const char **argv) | 429 | int main(int argc, const char **argv) |
429 | { | 430 | { |
430 | struct cacheitem item; | 431 | struct cacheitem item; |
431 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 432 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
432 | 433 | ||
433 | prepare_context(&ctx); | 434 | prepare_context(&ctx); |
434 | item.st.st_mtime = time(NULL); | 435 | item.st.st_mtime = time(NULL); |
435 | cgit_repolist.length = 0; | 436 | cgit_repolist.length = 0; |
436 | cgit_repolist.count = 0; | 437 | cgit_repolist.count = 0; |
437 | cgit_repolist.repos = NULL; | 438 | cgit_repolist.repos = NULL; |
438 | 439 | ||
439 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 440 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
440 | config_cb); | 441 | config_cb); |
441 | if (getenv("SCRIPT_NAME")) | 442 | if (getenv("SCRIPT_NAME")) |
442 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 443 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
443 | if (getenv("QUERY_STRING")) | 444 | if (getenv("QUERY_STRING")) |
444 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 445 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
445 | cgit_parse_args(argc, argv); | 446 | cgit_parse_args(argc, argv); |
446 | cgit_parse_query(ctx.qry.raw, querystring_cb); | 447 | cgit_parse_query(ctx.qry.raw, querystring_cb); |
447 | if (!cgit_prepare_cache(&item)) | 448 | if (!cgit_prepare_cache(&item)) |
448 | return 0; | 449 | return 0; |
449 | if (ctx.cfg.nocache) { | 450 | if (ctx.cfg.nocache) { |
450 | cgit_fill_cache(&item, 0); | 451 | cgit_fill_cache(&item, 0); |
451 | } else { | 452 | } else { |
452 | cgit_check_cache(&item); | 453 | cgit_check_cache(&item); |
453 | cgit_print_cache(&item); | 454 | cgit_print_cache(&item); |
454 | } | 455 | } |
455 | return 0; | 456 | return 0; |
456 | } | 457 | } |