aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hjemli2008-03-24 17:26:08 +0100
committerLars Hjemli2008-03-24 17:26:08 +0100
commit163037e79c6cde1073d555dbeae2a095298e6101 (patch)
tree37f36b95772eff04683a7f7efc1c5c369b7bf905
parenta4d1ca1dc6ff8171694d9e2280b6075a1beced0c (diff)
downloadcgit-163037e79c6cde1073d555dbeae2a095298e6101.tar.gz
cgit-163037e79c6cde1073d555dbeae2a095298e6101.tar.bz2
cgit-163037e79c6cde1073d555dbeae2a095298e6101.zip
Move non-generic functions from shared.c to cgit.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat
-rw-r--r--cgit.c156
-rw-r--r--cgit.h4
-rw-r--r--shared.c152
3 files changed, 155 insertions, 157 deletions
diff --git a/cgit.c b/cgit.c
index dbb023e..b3dd119 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,6 +10,156 @@
10#include "cmd.h" 10#include "cmd.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13void config_cb(const char *name, const char *value)
14{
15 if (!strcmp(name, "root-title"))
16 ctx.cfg.root_title = xstrdup(value);
17 else if (!strcmp(name, "css"))
18 ctx.cfg.css = xstrdup(value);
19 else if (!strcmp(name, "logo"))
20 ctx.cfg.logo = xstrdup(value);
21 else if (!strcmp(name, "index-header"))
22 ctx.cfg.index_header = xstrdup(value);
23 else if (!strcmp(name, "index-info"))
24 ctx.cfg.index_info = xstrdup(value);
25 else if (!strcmp(name, "logo-link"))
26 ctx.cfg.logo_link = xstrdup(value);
27 else if (!strcmp(name, "module-link"))
28 ctx.cfg.module_link = xstrdup(value);
29 else if (!strcmp(name, "virtual-root")) {
30 ctx.cfg.virtual_root = trim_end(value, '/');
31 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
32 ctx.cfg.virtual_root = "";
33 } else if (!strcmp(name, "nocache"))
34 ctx.cfg.nocache = atoi(value);
35 else if (!strcmp(name, "snapshots"))
36 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
37 else if (!strcmp(name, "enable-index-links"))
38 ctx.cfg.enable_index_links = atoi(value);
39 else if (!strcmp(name, "enable-log-filecount"))
40 ctx.cfg.enable_log_filecount = atoi(value);
41 else if (!strcmp(name, "enable-log-linecount"))
42 ctx.cfg.enable_log_linecount = atoi(value);
43 else if (!strcmp(name, "cache-root"))
44 ctx.cfg.cache_root = xstrdup(value);
45 else if (!strcmp(name, "cache-root-ttl"))
46 ctx.cfg.cache_root_ttl = atoi(value);
47 else if (!strcmp(name, "cache-repo-ttl"))
48 ctx.cfg.cache_repo_ttl = atoi(value);
49 else if (!strcmp(name, "cache-static-ttl"))
50 ctx.cfg.cache_static_ttl = atoi(value);
51 else if (!strcmp(name, "cache-dynamic-ttl"))
52 ctx.cfg.cache_dynamic_ttl = atoi(value);
53 else if (!strcmp(name, "max-message-length"))
54 ctx.cfg.max_msg_len = atoi(value);
55 else if (!strcmp(name, "max-repodesc-length"))
56 ctx.cfg.max_repodesc_len = atoi(value);
57 else if (!strcmp(name, "max-commit-count"))
58 ctx.cfg.max_commit_count = atoi(value);
59 else if (!strcmp(name, "summary-log"))
60 ctx.cfg.summary_log = atoi(value);
61 else if (!strcmp(name, "summary-branches"))
62 ctx.cfg.summary_branches = atoi(value);
63 else if (!strcmp(name, "summary-tags"))
64 ctx.cfg.summary_tags = atoi(value);
65 else if (!strcmp(name, "agefile"))
66 ctx.cfg.agefile = xstrdup(value);
67 else if (!strcmp(name, "renamelimit"))
68 ctx.cfg.renamelimit = atoi(value);
69 else if (!strcmp(name, "robots"))
70 ctx.cfg.robots = xstrdup(value);
71 else if (!strcmp(name, "clone-prefix"))
72 ctx.cfg.clone_prefix = xstrdup(value);
73 else if (!strcmp(name, "repo.group"))
74 ctx.cfg.repo_group = xstrdup(value);
75 else if (!strcmp(name, "repo.url"))
76 ctx.repo = cgit_add_repo(value);
77 else if (!strcmp(name, "repo.name"))
78 ctx.repo->name = xstrdup(value);
79 else if (ctx.repo && !strcmp(name, "repo.path"))
80 ctx.repo->path = trim_end(value, '/');
81 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
82 ctx.repo->clone_url = xstrdup(value);
83 else if (ctx.repo && !strcmp(name, "repo.desc"))
84 ctx.repo->desc = xstrdup(value);
85 else if (ctx.repo && !strcmp(name, "repo.owner"))
86 ctx.repo->owner = xstrdup(value);
87 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
88 ctx.repo->defbranch = xstrdup(value);
89 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
90 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
91 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
92 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
93 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
94 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
95 else if (ctx.repo && !strcmp(name, "repo.module-link"))
96 ctx.repo->module_link= xstrdup(value);
97 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
98 if (*value == '/')
99 ctx.repo->readme = xstrdup(value);
100 else
101 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
102 } else if (!strcmp(name, "include"))
103 cgit_read_config(value, config_cb);
104}
105
106static void querystring_cb(const char *name, const char *value)
107{
108 if (!strcmp(name,"r")) {
109 ctx.qry.repo = xstrdup(value);
110 ctx.repo = cgit_get_repoinfo(value);
111 } else if (!strcmp(name, "p")) {
112 ctx.qry.page = xstrdup(value);
113 } else if (!strcmp(name, "url")) {
114 cgit_parse_url(value);
115 } else if (!strcmp(name, "qt")) {
116 ctx.qry.grep = xstrdup(value);
117 } else if (!strcmp(name, "q")) {
118 ctx.qry.search = xstrdup(value);
119 } else if (!strcmp(name, "h")) {
120 ctx.qry.head = xstrdup(value);
121 ctx.qry.has_symref = 1;
122 } else if (!strcmp(name, "id")) {
123 ctx.qry.sha1 = xstrdup(value);
124 ctx.qry.has_sha1 = 1;
125 } else if (!strcmp(name, "id2")) {
126 ctx.qry.sha2 = xstrdup(value);
127 ctx.qry.has_sha1 = 1;
128 } else if (!strcmp(name, "ofs")) {
129 ctx.qry.ofs = atoi(value);
130 } else if (!strcmp(name, "path")) {
131 ctx.qry.path = trim_end(value, '/');
132 } else if (!strcmp(name, "name")) {
133 ctx.qry.name = xstrdup(value);
134 }
135}
136
137static void prepare_context(struct cgit_context *ctx)
138{
139 memset(ctx, 0, sizeof(ctx));
140 ctx->cfg.agefile = "info/web/last-modified";
141 ctx->cfg.cache_dynamic_ttl = 5;
142 ctx->cfg.cache_max_create_time = 5;
143 ctx->cfg.cache_repo_ttl = 5;
144 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
145 ctx->cfg.cache_root_ttl = 5;
146 ctx->cfg.cache_static_ttl = -1;
147 ctx->cfg.css = "/cgit.css";
148 ctx->cfg.logo = "/git-logo.png";
149 ctx->cfg.max_commit_count = 50;
150 ctx->cfg.max_lock_attempts = 5;
151 ctx->cfg.max_msg_len = 60;
152 ctx->cfg.max_repodesc_len = 60;
153 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
154 ctx->cfg.renamelimit = -1;
155 ctx->cfg.robots = "index, nofollow";
156 ctx->cfg.root_title = "Git repository browser";
157 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
158 ctx->page.mimetype = "text/html";
159 ctx->page.charset = PAGE_ENCODING;
160 ctx->page.filename = NULL;
161}
162
13static int cgit_prepare_cache(struct cacheitem *item) 163static int cgit_prepare_cache(struct cacheitem *item)
14{ 164{
15 if (!ctx.repo && ctx.qry.repo) { 165 if (!ctx.repo && ctx.qry.repo) {
@@ -277,20 +427,20 @@ int main(int argc, const char **argv)
277 struct cacheitem item; 427 struct cacheitem item;
278 const char *cgit_config_env = getenv("CGIT_CONFIG"); 428 const char *cgit_config_env = getenv("CGIT_CONFIG");
279 429
280 cgit_prepare_context(&ctx); 430 prepare_context(&ctx);
281 item.st.st_mtime = time(NULL); 431 item.st.st_mtime = time(NULL);
282 cgit_repolist.length = 0; 432 cgit_repolist.length = 0;
283 cgit_repolist.count = 0; 433 cgit_repolist.count = 0;
284 cgit_repolist.repos = NULL; 434 cgit_repolist.repos = NULL;
285 435
286 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 436 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
287 cgit_global_config_cb); 437 config_cb);
288 if (getenv("SCRIPT_NAME")) 438 if (getenv("SCRIPT_NAME"))
289 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 439 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
290 if (getenv("QUERY_STRING")) 440 if (getenv("QUERY_STRING"))
291 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 441 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
292 cgit_parse_args(argc, argv); 442 cgit_parse_args(argc, argv);
293 cgit_parse_query(ctx.qry.raw, cgit_querystring_cb); 443 cgit_parse_query(ctx.qry.raw, querystring_cb);
294 if (!cgit_prepare_cache(&item)) 444 if (!cgit_prepare_cache(&item))
295 return 0; 445 return 0;
296 if (ctx.cfg.nocache) { 446 if (ctx.cfg.nocache) {
diff --git a/cgit.h b/cgit.h
index c1a231d..b58676b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -191,11 +191,9 @@ extern struct cgit_context ctx;
191extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 191extern const struct cgit_snapshot_format cgit_snapshot_formats[];
192extern int cgit_cmd; 192extern int cgit_cmd;
193 193
194extern void cgit_prepare_context(struct cgit_context *ctx); 194extern struct cgit_repo *cgit_add_repo(const char *url);
195extern struct cgit_repo *cgit_get_repoinfo(const char *url); 195extern struct cgit_repo *cgit_get_repoinfo(const char *url);
196extern void cgit_global_config_cb(const char *name, const char *value);
197extern void cgit_repo_config_cb(const char *name, const char *value); 196extern void cgit_repo_config_cb(const char *name, const char *value);
198extern void cgit_querystring_cb(const char *name, const char *value);
199 197
200extern int chk_zero(int result, char *msg); 198extern int chk_zero(int result, char *msg);
201extern int chk_positive(int result, char *msg); 199extern int chk_positive(int result, char *msg);
diff --git a/shared.c b/shared.c
index 800c06a..cd60da5 100644
--- a/shared.c
+++ b/shared.c
@@ -14,32 +14,6 @@ int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
16 16
17void cgit_prepare_context(struct cgit_context *ctx)
18{
19 memset(ctx, 0, sizeof(ctx));
20 ctx->cfg.agefile = "info/web/last-modified";
21 ctx->cfg.cache_dynamic_ttl = 5;
22 ctx->cfg.cache_max_create_time = 5;
23 ctx->cfg.cache_repo_ttl = 5;
24 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
25 ctx->cfg.cache_root_ttl = 5;
26 ctx->cfg.cache_static_ttl = -1;
27 ctx->cfg.css = "/cgit.css";
28 ctx->cfg.logo = "/git-logo.png";
29 ctx->cfg.max_commit_count = 50;
30 ctx->cfg.max_lock_attempts = 5;
31 ctx->cfg.max_msg_len = 60;
32 ctx->cfg.max_repodesc_len = 60;
33 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
34 ctx->cfg.renamelimit = -1;
35 ctx->cfg.robots = "index, nofollow";
36 ctx->cfg.root_title = "Git repository browser";
37 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
38 ctx->page.mimetype = "text/html";
39 ctx->page.charset = PAGE_ENCODING;
40 ctx->page.filename = NULL;
41}
42
43int chk_zero(int result, char *msg) 17int chk_zero(int result, char *msg)
44{ 18{
45 if (result != 0) 19 if (result != 0)
@@ -61,7 +35,7 @@ int chk_non_negative(int result, char *msg)
61 return result; 35 return result;
62} 36}
63 37
64struct cgit_repo *add_repo(const char *url) 38struct cgit_repo *cgit_add_repo(const char *url)
65{ 39{
66 struct cgit_repo *ret; 40 struct cgit_repo *ret;
67 41
@@ -104,130 +78,6 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
104 return NULL; 78 return NULL;
105} 79}
106 80
107void cgit_global_config_cb(const char *name, const char *value)
108{
109 if (!strcmp(name, "root-title"))
110 ctx.cfg.root_title = xstrdup(value);
111 else if (!strcmp(name, "css"))
112 ctx.cfg.css = xstrdup(value);
113 else if (!strcmp(name, "logo"))
114 ctx.cfg.logo = xstrdup(value);
115 else if (!strcmp(name, "index-header"))
116 ctx.cfg.index_header = xstrdup(value);
117 else if (!strcmp(name, "index-info"))
118 ctx.cfg.index_info = xstrdup(value);
119 else if (!strcmp(name, "logo-link"))
120 ctx.cfg.logo_link = xstrdup(value);
121 else if (!strcmp(name, "module-link"))
122 ctx.cfg.module_link = xstrdup(value);
123 else if (!strcmp(name, "virtual-root")) {
124 ctx.cfg.virtual_root = trim_end(value, '/');
125 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
126 ctx.cfg.virtual_root = "";
127 } else if (!strcmp(name, "nocache"))
128 ctx.cfg.nocache = atoi(value);
129 else if (!strcmp(name, "snapshots"))
130 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
131 else if (!strcmp(name, "enable-index-links"))
132 ctx.cfg.enable_index_links = atoi(value);
133 else if (!strcmp(name, "enable-log-filecount"))
134 ctx.cfg.enable_log_filecount = atoi(value);
135 else if (!strcmp(name, "enable-log-linecount"))
136 ctx.cfg.enable_log_linecount = atoi(value);
137 else if (!strcmp(name, "cache-root"))
138 ctx.cfg.cache_root = xstrdup(value);
139 else if (!strcmp(name, "cache-root-ttl"))
140 ctx.cfg.cache_root_ttl = atoi(value);
141 else if (!strcmp(name, "cache-repo-ttl"))
142 ctx.cfg.cache_repo_ttl = atoi(value);
143 else if (!strcmp(name, "cache-static-ttl"))
144 ctx.cfg.cache_static_ttl = atoi(value);
145 else if (!strcmp(name, "cache-dynamic-ttl"))
146 ctx.cfg.cache_dynamic_ttl = atoi(value);
147 else if (!strcmp(name, "max-message-length"))
148 ctx.cfg.max_msg_len = atoi(value);
149 else if (!strcmp(name, "max-repodesc-length"))
150 ctx.cfg.max_repodesc_len = atoi(value);
151 else if (!strcmp(name, "max-commit-count"))
152 ctx.cfg.max_commit_count = atoi(value);
153 else if (!strcmp(name, "summary-log"))
154 ctx.cfg.summary_log = atoi(value);
155 else if (!strcmp(name, "summary-branches"))
156 ctx.cfg.summary_branches = atoi(value);
157 else if (!strcmp(name, "summary-tags"))
158 ctx.cfg.summary_tags = atoi(value);
159 else if (!strcmp(name, "agefile"))
160 ctx.cfg.agefile = xstrdup(value);
161 else if (!strcmp(name, "renamelimit"))
162 ctx.cfg.renamelimit = atoi(value);
163 else if (!strcmp(name, "robots"))
164 ctx.cfg.robots = xstrdup(value);
165 else if (!strcmp(name, "clone-prefix"))
166 ctx.cfg.clone_prefix = xstrdup(value);
167 else if (!strcmp(name, "repo.group"))
168 ctx.cfg.repo_group = xstrdup(value);
169 else if (!strcmp(name, "repo.url"))
170 ctx.repo = add_repo(value);
171 else if (!strcmp(name, "repo.name"))
172 ctx.repo->name = xstrdup(value);
173 else if (ctx.repo && !strcmp(name, "repo.path"))
174 ctx.repo->path = trim_end(value, '/');
175 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
176 ctx.repo->clone_url = xstrdup(value);
177 else if (ctx.repo && !strcmp(name, "repo.desc"))
178 ctx.repo->desc = xstrdup(value);
179 else if (ctx.repo && !strcmp(name, "repo.owner"))
180 ctx.repo->owner = xstrdup(value);
181 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
182 ctx.repo->defbranch = xstrdup(value);
183 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
184 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
185 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
186 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
187 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
188 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
189 else if (ctx.repo && !strcmp(name, "repo.module-link"))
190 ctx.repo->module_link= xstrdup(value);
191 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
192 if (*value == '/')
193 ctx.repo->readme = xstrdup(value);
194 else
195 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
196 } else if (!strcmp(name, "include"))
197 cgit_read_config(value, cgit_global_config_cb);
198}
199
200void cgit_querystring_cb(const char *name, const char *value)
201{
202 if (!strcmp(name,"r")) {
203 ctx.qry.repo = xstrdup(value);
204 ctx.repo = cgit_get_repoinfo(value);
205 } else if (!strcmp(name, "p")) {
206 ctx.qry.page = xstrdup(value);
207 } else if (!strcmp(name, "url")) {
208 cgit_parse_url(value);
209 } else if (!strcmp(name, "qt")) {
210 ctx.qry.grep = xstrdup(value);
211 } else if (!strcmp(name, "q")) {
212 ctx.qry.search = xstrdup(value);
213 } else if (!strcmp(name, "h")) {
214 ctx.qry.head = xstrdup(value);
215 ctx.qry.has_symref = 1;
216 } else if (!strcmp(name, "id")) {
217 ctx.qry.sha1 = xstrdup(value);
218 ctx.qry.has_sha1 = 1;
219 } else if (!strcmp(name, "id2")) {
220 ctx.qry.sha2 = xstrdup(value);
221 ctx.qry.has_sha1 = 1;
222 } else if (!strcmp(name, "ofs")) {
223 ctx.qry.ofs = atoi(value);
224 } else if (!strcmp(name, "path")) {
225 ctx.qry.path = trim_end(value, '/');
226 } else if (!strcmp(name, "name")) {
227 ctx.qry.name = xstrdup(value);
228 }
229}
230
231void *cgit_free_commitinfo(struct commitinfo *info) 81void *cgit_free_commitinfo(struct commitinfo *info)
232{ 82{
233 free(info->author); 83 free(info->author);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-25 09:13:24 +0000