author | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:07:13 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:10:50 (UTC) |
commit | b228d4ff82a65fdcd4a7364759fe36a0bdda5978 (patch) (unidiff) | |
tree | 33b8cc2ff48113f8d7ad3ba88c7ea19a7cac570a /shared.c | |
parent | d14d77fe95c3b6224b40df9b101dded0deea913c (diff) | |
download | cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.zip cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.tar.gz cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.tar.bz2 |
Add all config variables into struct cgit_context
This removes another big set of global variables, and introduces the
cgit_prepare_context() function which populates a context-variable with
compile-time default values.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 138 |
1 files changed, 63 insertions, 75 deletions
@@ -6,61 +6,49 @@ | |||
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 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | struct cgit_context ctx; | 13 | struct cgit_context ctx; |
14 | int cgit_cmd; | 14 | int cgit_cmd; |
15 | 15 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | char *cgit_root_title = "Git repository browser"; | ||
19 | char *cgit_css = "/cgit.css"; | ||
20 | char *cgit_logo = "/git-logo.png"; | ||
21 | char *cgit_index_header = NULL; | ||
22 | char *cgit_index_info = NULL; | ||
23 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | ||
24 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | ||
25 | char *cgit_agefile = "info/web/last-modified"; | ||
26 | char *cgit_virtual_root = NULL; | ||
27 | char *cgit_script_name = CGIT_SCRIPT_NAME; | ||
28 | char *cgit_cache_root = CGIT_CACHE_ROOT; | ||
29 | char *cgit_repo_group = NULL; | ||
30 | char *cgit_robots = "index, nofollow"; | ||
31 | char *cgit_clone_prefix = NULL; | ||
32 | |||
33 | int cgit_nocache = 0; | ||
34 | int cgit_snapshots = 0; | ||
35 | int cgit_enable_index_links = 0; | ||
36 | int cgit_enable_log_filecount = 0; | ||
37 | int cgit_enable_log_linecount = 0; | ||
38 | int cgit_max_lock_attempts = 5; | ||
39 | int cgit_cache_root_ttl = 5; | ||
40 | int cgit_cache_repo_ttl = 5; | ||
41 | int cgit_cache_dynamic_ttl = 5; | ||
42 | int cgit_cache_static_ttl = -1; | ||
43 | int cgit_cache_max_create_time = 5; | ||
44 | int cgit_summary_log = 0; | ||
45 | int cgit_summary_tags = 0; | ||
46 | int cgit_summary_branches = 0; | ||
47 | int cgit_renamelimit = -1; | ||
48 | |||
49 | int cgit_max_msg_len = 60; | ||
50 | int cgit_max_repodesc_len = 60; | ||
51 | int cgit_max_commit_count = 50; | ||
52 | |||
53 | int htmlfd = 0; | 18 | int htmlfd = 0; |
54 | 19 | ||
20 | void cgit_prepare_context(struct cgit_context *ctx) | ||
21 | { | ||
22 | memset(ctx, 0, sizeof(ctx)); | ||
23 | ctx->cfg.agefile = "info/web/last-modified"; | ||
24 | ctx->cfg.cache_dynamic_ttl = 5; | ||
25 | ctx->cfg.cache_max_create_time = 5; | ||
26 | ctx->cfg.cache_repo_ttl = 5; | ||
27 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | ||
28 | ctx->cfg.cache_root_ttl = 5; | ||
29 | ctx->cfg.cache_static_ttl = -1; | ||
30 | ctx->cfg.css = "/cgit.css"; | ||
31 | ctx->cfg.logo = "/git-logo.png"; | ||
32 | ctx->cfg.max_commit_count = 50; | ||
33 | ctx->cfg.max_lock_attempts = 5; | ||
34 | ctx->cfg.max_msg_len = 60; | ||
35 | ctx->cfg.max_repodesc_len = 60; | ||
36 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | ||
37 | ctx->cfg.renamelimit = -1; | ||
38 | ctx->cfg.robots = "index, nofollow"; | ||
39 | ctx->cfg.root_title = "Git repository browser"; | ||
40 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | ||
41 | } | ||
42 | |||
55 | int cgit_get_cmd_index(const char *cmd) | 43 | int cgit_get_cmd_index(const char *cmd) |
56 | { | 44 | { |
57 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 45 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
58 | "snapshot", "tag", "refs", "patch", NULL}; | 46 | "snapshot", "tag", "refs", "patch", NULL}; |
59 | int i; | 47 | int i; |
60 | 48 | ||
61 | for(i = 0; cmds[i]; i++) | 49 | for(i = 0; cmds[i]; i++) |
62 | if (!strcmp(cmd, cmds[i])) | 50 | if (!strcmp(cmd, cmds[i])) |
63 | return i + 1; | 51 | return i + 1; |
64 | return 0; | 52 | return 0; |
65 | } | 53 | } |
66 | 54 | ||
@@ -96,129 +84,129 @@ struct repoinfo *add_repo(const char *url) | |||
96 | cgit_repolist.length *= 2; | 84 | cgit_repolist.length *= 2; |
97 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 85 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
98 | cgit_repolist.length * | 86 | cgit_repolist.length * |
99 | sizeof(struct repoinfo)); | 87 | sizeof(struct repoinfo)); |
100 | } | 88 | } |
101 | 89 | ||
102 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 90 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
103 | ret->url = trim_end(url, '/'); | 91 | ret->url = trim_end(url, '/'); |
104 | ret->name = ret->url; | 92 | ret->name = ret->url; |
105 | ret->path = NULL; | 93 | ret->path = NULL; |
106 | ret->desc = "[no description]"; | 94 | ret->desc = "[no description]"; |
107 | ret->owner = NULL; | 95 | ret->owner = NULL; |
108 | ret->group = cgit_repo_group; | 96 | ret->group = ctx.cfg.repo_group; |
109 | ret->defbranch = "master"; | 97 | ret->defbranch = "master"; |
110 | ret->snapshots = cgit_snapshots; | 98 | ret->snapshots = ctx.cfg.snapshots; |
111 | ret->enable_log_filecount = cgit_enable_log_filecount; | 99 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
112 | ret->enable_log_linecount = cgit_enable_log_linecount; | 100 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
113 | ret->module_link = cgit_module_link; | 101 | ret->module_link = ctx.cfg.module_link; |
114 | ret->readme = NULL; | 102 | ret->readme = NULL; |
115 | return ret; | 103 | return ret; |
116 | } | 104 | } |
117 | 105 | ||
118 | struct repoinfo *cgit_get_repoinfo(const char *url) | 106 | struct repoinfo *cgit_get_repoinfo(const char *url) |
119 | { | 107 | { |
120 | int i; | 108 | int i; |
121 | struct repoinfo *repo; | 109 | struct repoinfo *repo; |
122 | 110 | ||
123 | for (i=0; i<cgit_repolist.count; i++) { | 111 | for (i=0; i<cgit_repolist.count; i++) { |
124 | repo = &cgit_repolist.repos[i]; | 112 | repo = &cgit_repolist.repos[i]; |
125 | if (!strcmp(repo->url, url)) | 113 | if (!strcmp(repo->url, url)) |
126 | return repo; | 114 | return repo; |
127 | } | 115 | } |
128 | return NULL; | 116 | return NULL; |
129 | } | 117 | } |
130 | 118 | ||
131 | void cgit_global_config_cb(const char *name, const char *value) | 119 | void cgit_global_config_cb(const char *name, const char *value) |
132 | { | 120 | { |
133 | if (!strcmp(name, "root-title")) | 121 | if (!strcmp(name, "root-title")) |
134 | cgit_root_title = xstrdup(value); | 122 | ctx.cfg.root_title = xstrdup(value); |
135 | else if (!strcmp(name, "css")) | 123 | else if (!strcmp(name, "css")) |
136 | cgit_css = xstrdup(value); | 124 | ctx.cfg.css = xstrdup(value); |
137 | else if (!strcmp(name, "logo")) | 125 | else if (!strcmp(name, "logo")) |
138 | cgit_logo = xstrdup(value); | 126 | ctx.cfg.logo = xstrdup(value); |
139 | else if (!strcmp(name, "index-header")) | 127 | else if (!strcmp(name, "index-header")) |
140 | cgit_index_header = xstrdup(value); | 128 | ctx.cfg.index_header = xstrdup(value); |
141 | else if (!strcmp(name, "index-info")) | 129 | else if (!strcmp(name, "index-info")) |
142 | cgit_index_info = xstrdup(value); | 130 | ctx.cfg.index_info = xstrdup(value); |
143 | else if (!strcmp(name, "logo-link")) | 131 | else if (!strcmp(name, "logo-link")) |
144 | cgit_logo_link = xstrdup(value); | 132 | ctx.cfg.logo_link = xstrdup(value); |
145 | else if (!strcmp(name, "module-link")) | 133 | else if (!strcmp(name, "module-link")) |
146 | cgit_module_link = xstrdup(value); | 134 | ctx.cfg.module_link = xstrdup(value); |
147 | else if (!strcmp(name, "virtual-root")) { | 135 | else if (!strcmp(name, "virtual-root")) { |
148 | cgit_virtual_root = trim_end(value, '/'); | 136 | ctx.cfg.virtual_root = trim_end(value, '/'); |
149 | if (!cgit_virtual_root && (!strcmp(value, "/"))) | 137 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
150 | cgit_virtual_root = ""; | 138 | ctx.cfg.virtual_root = ""; |
151 | } else if (!strcmp(name, "nocache")) | 139 | } else if (!strcmp(name, "nocache")) |
152 | cgit_nocache = atoi(value); | 140 | ctx.cfg.nocache = atoi(value); |
153 | else if (!strcmp(name, "snapshots")) | 141 | else if (!strcmp(name, "snapshots")) |
154 | cgit_snapshots = cgit_parse_snapshots_mask(value); | 142 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
155 | else if (!strcmp(name, "enable-index-links")) | 143 | else if (!strcmp(name, "enable-index-links")) |
156 | cgit_enable_index_links = atoi(value); | 144 | ctx.cfg.enable_index_links = atoi(value); |
157 | else if (!strcmp(name, "enable-log-filecount")) | 145 | else if (!strcmp(name, "enable-log-filecount")) |
158 | cgit_enable_log_filecount = atoi(value); | 146 | ctx.cfg.enable_log_filecount = atoi(value); |
159 | else if (!strcmp(name, "enable-log-linecount")) | 147 | else if (!strcmp(name, "enable-log-linecount")) |
160 | cgit_enable_log_linecount = atoi(value); | 148 | ctx.cfg.enable_log_linecount = atoi(value); |
161 | else if (!strcmp(name, "cache-root")) | 149 | else if (!strcmp(name, "cache-root")) |
162 | cgit_cache_root = xstrdup(value); | 150 | ctx.cfg.cache_root = xstrdup(value); |
163 | else if (!strcmp(name, "cache-root-ttl")) | 151 | else if (!strcmp(name, "cache-root-ttl")) |
164 | cgit_cache_root_ttl = atoi(value); | 152 | ctx.cfg.cache_root_ttl = atoi(value); |
165 | else if (!strcmp(name, "cache-repo-ttl")) | 153 | else if (!strcmp(name, "cache-repo-ttl")) |
166 | cgit_cache_repo_ttl = atoi(value); | 154 | ctx.cfg.cache_repo_ttl = atoi(value); |
167 | else if (!strcmp(name, "cache-static-ttl")) | 155 | else if (!strcmp(name, "cache-static-ttl")) |
168 | cgit_cache_static_ttl = atoi(value); | 156 | ctx.cfg.cache_static_ttl = atoi(value); |
169 | else if (!strcmp(name, "cache-dynamic-ttl")) | 157 | else if (!strcmp(name, "cache-dynamic-ttl")) |
170 | cgit_cache_dynamic_ttl = atoi(value); | 158 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
171 | else if (!strcmp(name, "max-message-length")) | 159 | else if (!strcmp(name, "max-message-length")) |
172 | cgit_max_msg_len = atoi(value); | 160 | ctx.cfg.max_msg_len = atoi(value); |
173 | else if (!strcmp(name, "max-repodesc-length")) | 161 | else if (!strcmp(name, "max-repodesc-length")) |
174 | cgit_max_repodesc_len = atoi(value); | 162 | ctx.cfg.max_repodesc_len = atoi(value); |
175 | else if (!strcmp(name, "max-commit-count")) | 163 | else if (!strcmp(name, "max-commit-count")) |
176 | cgit_max_commit_count = atoi(value); | 164 | ctx.cfg.max_commit_count = atoi(value); |
177 | else if (!strcmp(name, "summary-log")) | 165 | else if (!strcmp(name, "summary-log")) |
178 | cgit_summary_log = atoi(value); | 166 | ctx.cfg.summary_log = atoi(value); |
179 | else if (!strcmp(name, "summary-branches")) | 167 | else if (!strcmp(name, "summary-branches")) |
180 | cgit_summary_branches = atoi(value); | 168 | ctx.cfg.summary_branches = atoi(value); |
181 | else if (!strcmp(name, "summary-tags")) | 169 | else if (!strcmp(name, "summary-tags")) |
182 | cgit_summary_tags = atoi(value); | 170 | ctx.cfg.summary_tags = atoi(value); |
183 | else if (!strcmp(name, "agefile")) | 171 | else if (!strcmp(name, "agefile")) |
184 | cgit_agefile = xstrdup(value); | 172 | ctx.cfg.agefile = xstrdup(value); |
185 | else if (!strcmp(name, "renamelimit")) | 173 | else if (!strcmp(name, "renamelimit")) |
186 | cgit_renamelimit = atoi(value); | 174 | ctx.cfg.renamelimit = atoi(value); |
187 | else if (!strcmp(name, "robots")) | 175 | else if (!strcmp(name, "robots")) |
188 | cgit_robots = xstrdup(value); | 176 | ctx.cfg.robots = xstrdup(value); |
189 | else if (!strcmp(name, "clone-prefix")) | 177 | else if (!strcmp(name, "clone-prefix")) |
190 | cgit_clone_prefix = xstrdup(value); | 178 | ctx.cfg.clone_prefix = xstrdup(value); |
191 | else if (!strcmp(name, "repo.group")) | 179 | else if (!strcmp(name, "repo.group")) |
192 | cgit_repo_group = xstrdup(value); | 180 | ctx.cfg.repo_group = xstrdup(value); |
193 | else if (!strcmp(name, "repo.url")) | 181 | else if (!strcmp(name, "repo.url")) |
194 | cgit_repo = add_repo(value); | 182 | cgit_repo = add_repo(value); |
195 | else if (!strcmp(name, "repo.name")) | 183 | else if (!strcmp(name, "repo.name")) |
196 | cgit_repo->name = xstrdup(value); | 184 | cgit_repo->name = xstrdup(value); |
197 | else if (cgit_repo && !strcmp(name, "repo.path")) | 185 | else if (cgit_repo && !strcmp(name, "repo.path")) |
198 | cgit_repo->path = trim_end(value, '/'); | 186 | cgit_repo->path = trim_end(value, '/'); |
199 | else if (cgit_repo && !strcmp(name, "repo.clone-url")) | 187 | else if (cgit_repo && !strcmp(name, "repo.clone-url")) |
200 | cgit_repo->clone_url = xstrdup(value); | 188 | cgit_repo->clone_url = xstrdup(value); |
201 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 189 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
202 | cgit_repo->desc = xstrdup(value); | 190 | cgit_repo->desc = xstrdup(value); |
203 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 191 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
204 | cgit_repo->owner = xstrdup(value); | 192 | cgit_repo->owner = xstrdup(value); |
205 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 193 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
206 | cgit_repo->defbranch = xstrdup(value); | 194 | cgit_repo->defbranch = xstrdup(value); |
207 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 195 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
208 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 196 | cgit_repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
209 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 197 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
210 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 198 | cgit_repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
211 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 199 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
212 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 200 | cgit_repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
213 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 201 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
214 | cgit_repo->module_link= xstrdup(value); | 202 | cgit_repo->module_link= xstrdup(value); |
215 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 203 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
216 | if (*value == '/') | 204 | if (*value == '/') |
217 | cgit_repo->readme = xstrdup(value); | 205 | cgit_repo->readme = xstrdup(value); |
218 | else | 206 | else |
219 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 207 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
220 | } else if (!strcmp(name, "include")) | 208 | } else if (!strcmp(name, "include")) |
221 | cgit_read_config(value, cgit_global_config_cb); | 209 | cgit_read_config(value, cgit_global_config_cb); |
222 | } | 210 | } |
223 | 211 | ||
224 | void cgit_querystring_cb(const char *name, const char *value) | 212 | void cgit_querystring_cb(const char *name, const char *value) |
@@ -467,25 +455,25 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
467 | 455 | ||
468 | void cgit_diff_tree(const unsigned char *old_sha1, | 456 | void cgit_diff_tree(const unsigned char *old_sha1, |
469 | const unsigned char *new_sha1, | 457 | const unsigned char *new_sha1, |
470 | filepair_fn fn, const char *prefix) | 458 | filepair_fn fn, const char *prefix) |
471 | { | 459 | { |
472 | struct diff_options opt; | 460 | struct diff_options opt; |
473 | int ret; | 461 | int ret; |
474 | int prefixlen; | 462 | int prefixlen; |
475 | 463 | ||
476 | diff_setup(&opt); | 464 | diff_setup(&opt); |
477 | opt.output_format = DIFF_FORMAT_CALLBACK; | 465 | opt.output_format = DIFF_FORMAT_CALLBACK; |
478 | opt.detect_rename = 1; | 466 | opt.detect_rename = 1; |
479 | opt.rename_limit = cgit_renamelimit; | 467 | opt.rename_limit = ctx.cfg.renamelimit; |
480 | DIFF_OPT_SET(&opt, RECURSIVE); | 468 | DIFF_OPT_SET(&opt, RECURSIVE); |
481 | opt.format_callback = cgit_diff_tree_cb; | 469 | opt.format_callback = cgit_diff_tree_cb; |
482 | opt.format_callback_data = fn; | 470 | opt.format_callback_data = fn; |
483 | if (prefix) { | 471 | if (prefix) { |
484 | opt.nr_paths = 1; | 472 | opt.nr_paths = 1; |
485 | opt.paths = &prefix; | 473 | opt.paths = &prefix; |
486 | prefixlen = strlen(prefix); | 474 | prefixlen = strlen(prefix); |
487 | opt.pathlens = &prefixlen; | 475 | opt.pathlens = &prefixlen; |
488 | } | 476 | } |
489 | diff_setup_done(&opt); | 477 | diff_setup_done(&opt); |
490 | 478 | ||
491 | if (old_sha1 && !is_null_sha1(old_sha1)) | 479 | if (old_sha1 && !is_null_sha1(old_sha1)) |