|
diff --git a/cgit.c b/cgit.c index e2d5edb..f49fffa 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -26,208 +26,211 @@ void config_cb(const char *name, const char *value) |
26 | else if (!strcmp(name, "css")) |
26 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); |
27 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "favicon")) |
28 | else if (!strcmp(name, "favicon")) |
29 | ctx.cfg.favicon = xstrdup(value); |
29 | ctx.cfg.favicon = xstrdup(value); |
30 | else if (!strcmp(name, "footer")) |
30 | else if (!strcmp(name, "footer")) |
31 | ctx.cfg.footer = xstrdup(value); |
31 | ctx.cfg.footer = xstrdup(value); |
32 | else if (!strcmp(name, "logo")) |
32 | else if (!strcmp(name, "logo")) |
33 | ctx.cfg.logo = xstrdup(value); |
33 | ctx.cfg.logo = xstrdup(value); |
34 | else if (!strcmp(name, "index-header")) |
34 | else if (!strcmp(name, "index-header")) |
35 | ctx.cfg.index_header = xstrdup(value); |
35 | ctx.cfg.index_header = xstrdup(value); |
36 | else if (!strcmp(name, "index-info")) |
36 | else if (!strcmp(name, "index-info")) |
37 | ctx.cfg.index_info = xstrdup(value); |
37 | ctx.cfg.index_info = xstrdup(value); |
38 | else if (!strcmp(name, "logo-link")) |
38 | else if (!strcmp(name, "logo-link")) |
39 | ctx.cfg.logo_link = xstrdup(value); |
39 | ctx.cfg.logo_link = xstrdup(value); |
40 | else if (!strcmp(name, "module-link")) |
40 | else if (!strcmp(name, "module-link")) |
41 | ctx.cfg.module_link = xstrdup(value); |
41 | ctx.cfg.module_link = xstrdup(value); |
42 | else if (!strcmp(name, "virtual-root")) { |
42 | else if (!strcmp(name, "virtual-root")) { |
43 | ctx.cfg.virtual_root = trim_end(value, '/'); |
43 | ctx.cfg.virtual_root = trim_end(value, '/'); |
44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
45 | ctx.cfg.virtual_root = ""; |
45 | ctx.cfg.virtual_root = ""; |
46 | } else if (!strcmp(name, "nocache")) |
46 | } else if (!strcmp(name, "nocache")) |
47 | ctx.cfg.nocache = atoi(value); |
47 | ctx.cfg.nocache = atoi(value); |
48 | else if (!strcmp(name, "snapshots")) |
48 | else if (!strcmp(name, "snapshots")) |
49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
50 | else if (!strcmp(name, "enable-index-links")) |
50 | else if (!strcmp(name, "enable-index-links")) |
51 | ctx.cfg.enable_index_links = atoi(value); |
51 | ctx.cfg.enable_index_links = atoi(value); |
52 | else if (!strcmp(name, "enable-log-filecount")) |
52 | else if (!strcmp(name, "enable-log-filecount")) |
53 | ctx.cfg.enable_log_filecount = atoi(value); |
53 | ctx.cfg.enable_log_filecount = atoi(value); |
54 | else if (!strcmp(name, "enable-log-linecount")) |
54 | else if (!strcmp(name, "enable-log-linecount")) |
55 | ctx.cfg.enable_log_linecount = atoi(value); |
55 | ctx.cfg.enable_log_linecount = atoi(value); |
56 | else if (!strcmp(name, "cache-size")) |
56 | else if (!strcmp(name, "cache-size")) |
57 | ctx.cfg.cache_size = atoi(value); |
57 | ctx.cfg.cache_size = atoi(value); |
58 | else if (!strcmp(name, "cache-root")) |
58 | else if (!strcmp(name, "cache-root")) |
59 | ctx.cfg.cache_root = xstrdup(value); |
59 | ctx.cfg.cache_root = xstrdup(value); |
60 | else if (!strcmp(name, "cache-root-ttl")) |
60 | else if (!strcmp(name, "cache-root-ttl")) |
61 | ctx.cfg.cache_root_ttl = atoi(value); |
61 | ctx.cfg.cache_root_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-repo-ttl")) |
62 | else if (!strcmp(name, "cache-repo-ttl")) |
63 | ctx.cfg.cache_repo_ttl = atoi(value); |
63 | ctx.cfg.cache_repo_ttl = atoi(value); |
64 | else if (!strcmp(name, "cache-static-ttl")) |
64 | else if (!strcmp(name, "cache-static-ttl")) |
65 | ctx.cfg.cache_static_ttl = atoi(value); |
65 | ctx.cfg.cache_static_ttl = atoi(value); |
66 | else if (!strcmp(name, "cache-dynamic-ttl")) |
66 | else if (!strcmp(name, "cache-dynamic-ttl")) |
67 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
67 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
68 | else if (!strcmp(name, "max-message-length")) |
68 | else if (!strcmp(name, "max-message-length")) |
69 | ctx.cfg.max_msg_len = atoi(value); |
69 | ctx.cfg.max_msg_len = atoi(value); |
70 | else if (!strcmp(name, "max-repodesc-length")) |
70 | else if (!strcmp(name, "max-repodesc-length")) |
71 | ctx.cfg.max_repodesc_len = atoi(value); |
71 | ctx.cfg.max_repodesc_len = atoi(value); |
72 | else if (!strcmp(name, "max-repo-count")) |
72 | else if (!strcmp(name, "max-repo-count")) |
73 | ctx.cfg.max_repo_count = atoi(value); |
73 | ctx.cfg.max_repo_count = atoi(value); |
74 | else if (!strcmp(name, "max-commit-count")) |
74 | else if (!strcmp(name, "max-commit-count")) |
75 | ctx.cfg.max_commit_count = atoi(value); |
75 | ctx.cfg.max_commit_count = atoi(value); |
76 | else if (!strcmp(name, "summary-log")) |
76 | else if (!strcmp(name, "summary-log")) |
77 | ctx.cfg.summary_log = atoi(value); |
77 | ctx.cfg.summary_log = atoi(value); |
78 | else if (!strcmp(name, "summary-branches")) |
78 | else if (!strcmp(name, "summary-branches")) |
79 | ctx.cfg.summary_branches = atoi(value); |
79 | ctx.cfg.summary_branches = atoi(value); |
80 | else if (!strcmp(name, "summary-tags")) |
80 | else if (!strcmp(name, "summary-tags")) |
81 | ctx.cfg.summary_tags = atoi(value); |
81 | ctx.cfg.summary_tags = atoi(value); |
82 | else if (!strcmp(name, "agefile")) |
82 | else if (!strcmp(name, "agefile")) |
83 | ctx.cfg.agefile = xstrdup(value); |
83 | ctx.cfg.agefile = xstrdup(value); |
84 | else if (!strcmp(name, "renamelimit")) |
84 | else if (!strcmp(name, "renamelimit")) |
85 | ctx.cfg.renamelimit = atoi(value); |
85 | ctx.cfg.renamelimit = atoi(value); |
86 | else if (!strcmp(name, "robots")) |
86 | else if (!strcmp(name, "robots")) |
87 | ctx.cfg.robots = xstrdup(value); |
87 | ctx.cfg.robots = xstrdup(value); |
88 | else if (!strcmp(name, "clone-prefix")) |
88 | else if (!strcmp(name, "clone-prefix")) |
89 | ctx.cfg.clone_prefix = xstrdup(value); |
89 | ctx.cfg.clone_prefix = xstrdup(value); |
| |
90 | else if (!strcmp(name, "local-time")) |
| |
91 | ctx.cfg.local_time = atoi(value); |
90 | else if (!strcmp(name, "repo.group")) |
92 | else if (!strcmp(name, "repo.group")) |
91 | ctx.cfg.repo_group = xstrdup(value); |
93 | ctx.cfg.repo_group = xstrdup(value); |
92 | else if (!strcmp(name, "repo.url")) |
94 | else if (!strcmp(name, "repo.url")) |
93 | ctx.repo = cgit_add_repo(value); |
95 | ctx.repo = cgit_add_repo(value); |
94 | else if (!strcmp(name, "repo.name")) |
96 | else if (!strcmp(name, "repo.name")) |
95 | ctx.repo->name = xstrdup(value); |
97 | ctx.repo->name = xstrdup(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.path")) |
98 | else if (ctx.repo && !strcmp(name, "repo.path")) |
97 | ctx.repo->path = trim_end(value, '/'); |
99 | ctx.repo->path = trim_end(value, '/'); |
98 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
100 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
99 | ctx.repo->clone_url = xstrdup(value); |
101 | ctx.repo->clone_url = xstrdup(value); |
100 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
102 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
101 | ctx.repo->desc = xstrdup(value); |
103 | ctx.repo->desc = xstrdup(value); |
102 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
104 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
103 | ctx.repo->owner = xstrdup(value); |
105 | ctx.repo->owner = xstrdup(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
106 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
105 | ctx.repo->defbranch = xstrdup(value); |
107 | ctx.repo->defbranch = xstrdup(value); |
106 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
108 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
107 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
109 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
108 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
110 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
109 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
111 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
112 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
111 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
113 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
114 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
113 | ctx.repo->module_link= xstrdup(value); |
115 | ctx.repo->module_link= xstrdup(value); |
114 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
116 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
115 | if (*value == '/') |
117 | if (*value == '/') |
116 | ctx.repo->readme = xstrdup(value); |
118 | ctx.repo->readme = xstrdup(value); |
117 | else |
119 | else |
118 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
120 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
119 | } else if (!strcmp(name, "include")) |
121 | } else if (!strcmp(name, "include")) |
120 | parse_configfile(value, config_cb); |
122 | parse_configfile(value, config_cb); |
121 | } |
123 | } |
122 | |
124 | |
123 | static void querystring_cb(const char *name, const char *value) |
125 | static void querystring_cb(const char *name, const char *value) |
124 | { |
126 | { |
125 | if (!strcmp(name,"r")) { |
127 | if (!strcmp(name,"r")) { |
126 | ctx.qry.repo = xstrdup(value); |
128 | ctx.qry.repo = xstrdup(value); |
127 | ctx.repo = cgit_get_repoinfo(value); |
129 | ctx.repo = cgit_get_repoinfo(value); |
128 | } else if (!strcmp(name, "p")) { |
130 | } else if (!strcmp(name, "p")) { |
129 | ctx.qry.page = xstrdup(value); |
131 | ctx.qry.page = xstrdup(value); |
130 | } else if (!strcmp(name, "url")) { |
132 | } else if (!strcmp(name, "url")) { |
131 | cgit_parse_url(value); |
133 | cgit_parse_url(value); |
132 | } else if (!strcmp(name, "qt")) { |
134 | } else if (!strcmp(name, "qt")) { |
133 | ctx.qry.grep = xstrdup(value); |
135 | ctx.qry.grep = xstrdup(value); |
134 | } else if (!strcmp(name, "q")) { |
136 | } else if (!strcmp(name, "q")) { |
135 | ctx.qry.search = xstrdup(value); |
137 | ctx.qry.search = xstrdup(value); |
136 | } else if (!strcmp(name, "h")) { |
138 | } else if (!strcmp(name, "h")) { |
137 | ctx.qry.head = xstrdup(value); |
139 | ctx.qry.head = xstrdup(value); |
138 | ctx.qry.has_symref = 1; |
140 | ctx.qry.has_symref = 1; |
139 | } else if (!strcmp(name, "id")) { |
141 | } else if (!strcmp(name, "id")) { |
140 | ctx.qry.sha1 = xstrdup(value); |
142 | ctx.qry.sha1 = xstrdup(value); |
141 | ctx.qry.has_sha1 = 1; |
143 | ctx.qry.has_sha1 = 1; |
142 | } else if (!strcmp(name, "id2")) { |
144 | } else if (!strcmp(name, "id2")) { |
143 | ctx.qry.sha2 = xstrdup(value); |
145 | ctx.qry.sha2 = xstrdup(value); |
144 | ctx.qry.has_sha1 = 1; |
146 | ctx.qry.has_sha1 = 1; |
145 | } else if (!strcmp(name, "ofs")) { |
147 | } else if (!strcmp(name, "ofs")) { |
146 | ctx.qry.ofs = atoi(value); |
148 | ctx.qry.ofs = atoi(value); |
147 | } else if (!strcmp(name, "path")) { |
149 | } else if (!strcmp(name, "path")) { |
148 | ctx.qry.path = trim_end(value, '/'); |
150 | ctx.qry.path = trim_end(value, '/'); |
149 | } else if (!strcmp(name, "name")) { |
151 | } else if (!strcmp(name, "name")) { |
150 | ctx.qry.name = xstrdup(value); |
152 | ctx.qry.name = xstrdup(value); |
151 | } else if (!strcmp(name, "mimetype")) { |
153 | } else if (!strcmp(name, "mimetype")) { |
152 | ctx.qry.mimetype = xstrdup(value); |
154 | ctx.qry.mimetype = xstrdup(value); |
153 | } |
155 | } |
154 | } |
156 | } |
155 | |
157 | |
156 | static void prepare_context(struct cgit_context *ctx) |
158 | static void prepare_context(struct cgit_context *ctx) |
157 | { |
159 | { |
158 | memset(ctx, 0, sizeof(ctx)); |
160 | memset(ctx, 0, sizeof(ctx)); |
159 | ctx->cfg.agefile = "info/web/last-modified"; |
161 | ctx->cfg.agefile = "info/web/last-modified"; |
160 | ctx->cfg.nocache = 0; |
162 | ctx->cfg.nocache = 0; |
161 | ctx->cfg.cache_size = 0; |
163 | ctx->cfg.cache_size = 0; |
162 | ctx->cfg.cache_dynamic_ttl = 5; |
164 | ctx->cfg.cache_dynamic_ttl = 5; |
163 | ctx->cfg.cache_max_create_time = 5; |
165 | ctx->cfg.cache_max_create_time = 5; |
164 | ctx->cfg.cache_repo_ttl = 5; |
166 | ctx->cfg.cache_repo_ttl = 5; |
165 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
167 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
166 | ctx->cfg.cache_root_ttl = 5; |
168 | ctx->cfg.cache_root_ttl = 5; |
167 | ctx->cfg.cache_static_ttl = -1; |
169 | ctx->cfg.cache_static_ttl = -1; |
168 | ctx->cfg.css = "/cgit.css"; |
170 | ctx->cfg.css = "/cgit.css"; |
169 | ctx->cfg.logo = "/git-logo.png"; |
171 | ctx->cfg.logo = "/git-logo.png"; |
| |
172 | ctx->cfg.local_time = 0; |
170 | ctx->cfg.max_repo_count = 50; |
173 | ctx->cfg.max_repo_count = 50; |
171 | ctx->cfg.max_commit_count = 50; |
174 | ctx->cfg.max_commit_count = 50; |
172 | ctx->cfg.max_lock_attempts = 5; |
175 | ctx->cfg.max_lock_attempts = 5; |
173 | ctx->cfg.max_msg_len = 80; |
176 | ctx->cfg.max_msg_len = 80; |
174 | ctx->cfg.max_repodesc_len = 80; |
177 | ctx->cfg.max_repodesc_len = 80; |
175 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
178 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
176 | ctx->cfg.renamelimit = -1; |
179 | ctx->cfg.renamelimit = -1; |
177 | ctx->cfg.robots = "index, nofollow"; |
180 | ctx->cfg.robots = "index, nofollow"; |
178 | ctx->cfg.root_title = "Git repository browser"; |
181 | ctx->cfg.root_title = "Git repository browser"; |
179 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
182 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
180 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
183 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
181 | ctx->cfg.summary_branches = 10; |
184 | ctx->cfg.summary_branches = 10; |
182 | ctx->cfg.summary_log = 10; |
185 | ctx->cfg.summary_log = 10; |
183 | ctx->cfg.summary_tags = 10; |
186 | ctx->cfg.summary_tags = 10; |
184 | ctx->page.mimetype = "text/html"; |
187 | ctx->page.mimetype = "text/html"; |
185 | ctx->page.charset = PAGE_ENCODING; |
188 | ctx->page.charset = PAGE_ENCODING; |
186 | ctx->page.filename = NULL; |
189 | ctx->page.filename = NULL; |
187 | ctx->page.modified = time(NULL); |
190 | ctx->page.modified = time(NULL); |
188 | ctx->page.expires = ctx->page.modified; |
191 | ctx->page.expires = ctx->page.modified; |
189 | } |
192 | } |
190 | |
193 | |
191 | struct refmatch { |
194 | struct refmatch { |
192 | char *req_ref; |
195 | char *req_ref; |
193 | char *first_ref; |
196 | char *first_ref; |
194 | int match; |
197 | int match; |
195 | }; |
198 | }; |
196 | |
199 | |
197 | int find_current_ref(const char *refname, const unsigned char *sha1, |
200 | int find_current_ref(const char *refname, const unsigned char *sha1, |
198 | int flags, void *cb_data) |
201 | int flags, void *cb_data) |
199 | { |
202 | { |
200 | struct refmatch *info; |
203 | struct refmatch *info; |
201 | |
204 | |
202 | info = (struct refmatch *)cb_data; |
205 | info = (struct refmatch *)cb_data; |
203 | if (!strcmp(refname, info->req_ref)) |
206 | if (!strcmp(refname, info->req_ref)) |
204 | info->match = 1; |
207 | info->match = 1; |
205 | if (!info->first_ref) |
208 | if (!info->first_ref) |
206 | info->first_ref = xstrdup(refname); |
209 | info->first_ref = xstrdup(refname); |
207 | return info->match; |
210 | return info->match; |
208 | } |
211 | } |
209 | |
212 | |
210 | char *find_default_branch(struct cgit_repo *repo) |
213 | char *find_default_branch(struct cgit_repo *repo) |
211 | { |
214 | { |
212 | struct refmatch info; |
215 | struct refmatch info; |
213 | char *ref; |
216 | char *ref; |
214 | |
217 | |
215 | info.req_ref = repo->defbranch; |
218 | info.req_ref = repo->defbranch; |
216 | info.first_ref = NULL; |
219 | info.first_ref = NULL; |
217 | info.match = 0; |
220 | info.match = 0; |
218 | for_each_branch_ref(find_current_ref, &info); |
221 | for_each_branch_ref(find_current_ref, &info); |
219 | if (info.match) |
222 | if (info.match) |
220 | ref = info.req_ref; |
223 | ref = info.req_ref; |
221 | else |
224 | else |
222 | ref = info.first_ref; |
225 | ref = info.first_ref; |
223 | if (ref) |
226 | if (ref) |
224 | ref = xstrdup(ref); |
227 | ref = xstrdup(ref); |
225 | return ref; |
228 | return ref; |
226 | } |
229 | } |
227 | |
230 | |
228 | static int prepare_repo_cmd(struct cgit_context *ctx) |
231 | static int prepare_repo_cmd(struct cgit_context *ctx) |
229 | { |
232 | { |
230 | char *tmp; |
233 | char *tmp; |
231 | unsigned char sha1[20]; |
234 | unsigned char sha1[20]; |
232 | int nongit = 0; |
235 | int nongit = 0; |
233 | |
236 | |
|