-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -167,193 +167,193 @@ void config_cb(const char *name, const char *value) | |||
167 | ctx.cfg.embedded = atoi(value); | 167 | ctx.cfg.embedded = atoi(value); |
168 | else if (!strcmp(name, "max-message-length")) | 168 | else if (!strcmp(name, "max-message-length")) |
169 | ctx.cfg.max_msg_len = atoi(value); | 169 | ctx.cfg.max_msg_len = atoi(value); |
170 | else if (!strcmp(name, "max-repodesc-length")) | 170 | else if (!strcmp(name, "max-repodesc-length")) |
171 | ctx.cfg.max_repodesc_len = atoi(value); | 171 | ctx.cfg.max_repodesc_len = atoi(value); |
172 | else if (!strcmp(name, "max-blob-size")) | 172 | else if (!strcmp(name, "max-blob-size")) |
173 | ctx.cfg.max_blob_size = atoi(value); | 173 | ctx.cfg.max_blob_size = atoi(value); |
174 | else if (!strcmp(name, "max-repo-count")) | 174 | else if (!strcmp(name, "max-repo-count")) |
175 | ctx.cfg.max_repo_count = atoi(value); | 175 | ctx.cfg.max_repo_count = atoi(value); |
176 | else if (!strcmp(name, "max-commit-count")) | 176 | else if (!strcmp(name, "max-commit-count")) |
177 | ctx.cfg.max_commit_count = atoi(value); | 177 | ctx.cfg.max_commit_count = atoi(value); |
178 | else if (!strcmp(name, "scan-path")) | 178 | else if (!strcmp(name, "scan-path")) |
179 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 179 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
180 | process_cached_repolist(value); | 180 | process_cached_repolist(value); |
181 | else | 181 | else |
182 | scan_tree(value, repo_config); | 182 | scan_tree(value, repo_config); |
183 | else if (!strcmp(name, "source-filter")) | 183 | else if (!strcmp(name, "source-filter")) |
184 | ctx.cfg.source_filter = new_filter(value, 1); | 184 | ctx.cfg.source_filter = new_filter(value, 1); |
185 | else if (!strcmp(name, "summary-log")) | 185 | else if (!strcmp(name, "summary-log")) |
186 | ctx.cfg.summary_log = atoi(value); | 186 | ctx.cfg.summary_log = atoi(value); |
187 | else if (!strcmp(name, "summary-branches")) | 187 | else if (!strcmp(name, "summary-branches")) |
188 | ctx.cfg.summary_branches = atoi(value); | 188 | ctx.cfg.summary_branches = atoi(value); |
189 | else if (!strcmp(name, "summary-tags")) | 189 | else if (!strcmp(name, "summary-tags")) |
190 | ctx.cfg.summary_tags = atoi(value); | 190 | ctx.cfg.summary_tags = atoi(value); |
191 | else if (!strcmp(name, "side-by-side-diffs")) | 191 | else if (!strcmp(name, "side-by-side-diffs")) |
192 | ctx.cfg.ssdiff = atoi(value); | 192 | ctx.cfg.ssdiff = atoi(value); |
193 | else if (!strcmp(name, "agefile")) | 193 | else if (!strcmp(name, "agefile")) |
194 | ctx.cfg.agefile = xstrdup(value); | 194 | ctx.cfg.agefile = xstrdup(value); |
195 | else if (!strcmp(name, "renamelimit")) | 195 | else if (!strcmp(name, "renamelimit")) |
196 | ctx.cfg.renamelimit = atoi(value); | 196 | ctx.cfg.renamelimit = atoi(value); |
197 | else if (!strcmp(name, "robots")) | 197 | else if (!strcmp(name, "robots")) |
198 | ctx.cfg.robots = xstrdup(value); | 198 | ctx.cfg.robots = xstrdup(value); |
199 | else if (!strcmp(name, "clone-prefix")) | 199 | else if (!strcmp(name, "clone-prefix")) |
200 | ctx.cfg.clone_prefix = xstrdup(value); | 200 | ctx.cfg.clone_prefix = xstrdup(value); |
201 | else if (!strcmp(name, "local-time")) | 201 | else if (!strcmp(name, "local-time")) |
202 | ctx.cfg.local_time = atoi(value); | 202 | ctx.cfg.local_time = atoi(value); |
203 | else if (!prefixcmp(name, "mimetype.")) | 203 | else if (!prefixcmp(name, "mimetype.")) |
204 | add_mimetype(name + 9, value); | 204 | add_mimetype(name + 9, value); |
205 | else if (!strcmp(name, "include")) | 205 | else if (!strcmp(name, "include")) |
206 | parse_configfile(value, config_cb); | 206 | parse_configfile(value, config_cb); |
207 | } | 207 | } |
208 | 208 | ||
209 | static void querystring_cb(const char *name, const char *value) | 209 | static void querystring_cb(const char *name, const char *value) |
210 | { | 210 | { |
211 | if (!value) | 211 | if (!value) |
212 | value = ""; | 212 | value = ""; |
213 | 213 | ||
214 | if (!strcmp(name,"r")) { | 214 | if (!strcmp(name,"r")) { |
215 | ctx.qry.repo = xstrdup(value); | 215 | ctx.qry.repo = xstrdup(value); |
216 | ctx.repo = cgit_get_repoinfo(value); | 216 | ctx.repo = cgit_get_repoinfo(value); |
217 | } else if (!strcmp(name, "p")) { | 217 | } else if (!strcmp(name, "p")) { |
218 | ctx.qry.page = xstrdup(value); | 218 | ctx.qry.page = xstrdup(value); |
219 | } else if (!strcmp(name, "url")) { | 219 | } else if (!strcmp(name, "url")) { |
220 | if (*value == '/') | 220 | if (*value == '/') |
221 | value++; | 221 | value++; |
222 | ctx.qry.url = xstrdup(value); | 222 | ctx.qry.url = xstrdup(value); |
223 | cgit_parse_url(value); | 223 | cgit_parse_url(value); |
224 | } else if (!strcmp(name, "qt")) { | 224 | } else if (!strcmp(name, "qt")) { |
225 | ctx.qry.grep = xstrdup(value); | 225 | ctx.qry.grep = xstrdup(value); |
226 | } else if (!strcmp(name, "q")) { | 226 | } else if (!strcmp(name, "q")) { |
227 | ctx.qry.search = xstrdup(value); | 227 | ctx.qry.search = xstrdup(value); |
228 | } else if (!strcmp(name, "h")) { | 228 | } else if (!strcmp(name, "h")) { |
229 | ctx.qry.head = xstrdup(value); | 229 | ctx.qry.head = xstrdup(value); |
230 | ctx.qry.has_symref = 1; | 230 | ctx.qry.has_symref = 1; |
231 | } else if (!strcmp(name, "id")) { | 231 | } else if (!strcmp(name, "id")) { |
232 | ctx.qry.sha1 = xstrdup(value); | 232 | ctx.qry.sha1 = xstrdup(value); |
233 | ctx.qry.has_sha1 = 1; | 233 | ctx.qry.has_sha1 = 1; |
234 | } else if (!strcmp(name, "id2")) { | 234 | } else if (!strcmp(name, "id2")) { |
235 | ctx.qry.sha2 = xstrdup(value); | 235 | ctx.qry.sha2 = xstrdup(value); |
236 | ctx.qry.has_sha1 = 1; | 236 | ctx.qry.has_sha1 = 1; |
237 | } else if (!strcmp(name, "ofs")) { | 237 | } else if (!strcmp(name, "ofs")) { |
238 | ctx.qry.ofs = atoi(value); | 238 | ctx.qry.ofs = atoi(value); |
239 | } else if (!strcmp(name, "path")) { | 239 | } else if (!strcmp(name, "path")) { |
240 | ctx.qry.path = trim_end(value, '/'); | 240 | ctx.qry.path = trim_end(value, '/'); |
241 | } else if (!strcmp(name, "name")) { | 241 | } else if (!strcmp(name, "name")) { |
242 | ctx.qry.name = xstrdup(value); | 242 | ctx.qry.name = xstrdup(value); |
243 | } else if (!strcmp(name, "mimetype")) { | 243 | } else if (!strcmp(name, "mimetype")) { |
244 | ctx.qry.mimetype = xstrdup(value); | 244 | ctx.qry.mimetype = xstrdup(value); |
245 | } else if (!strcmp(name, "s")){ | 245 | } else if (!strcmp(name, "s")){ |
246 | ctx.qry.sort = xstrdup(value); | 246 | ctx.qry.sort = xstrdup(value); |
247 | } else if (!strcmp(name, "showmsg")) { | 247 | } else if (!strcmp(name, "showmsg")) { |
248 | ctx.qry.showmsg = atoi(value); | 248 | ctx.qry.showmsg = atoi(value); |
249 | } else if (!strcmp(name, "period")) { | 249 | } else if (!strcmp(name, "period")) { |
250 | ctx.qry.period = xstrdup(value); | 250 | ctx.qry.period = xstrdup(value); |
251 | } else if (!strcmp(name, "ss")) { | 251 | } else if (!strcmp(name, "ss")) { |
252 | ctx.qry.ssdiff = atoi(value); | 252 | ctx.qry.ssdiff = atoi(value); |
253 | } | 253 | } |
254 | } | 254 | } |
255 | 255 | ||
256 | char *xstrdupn(const char *str) | 256 | char *xstrdupn(const char *str) |
257 | { | 257 | { |
258 | return (str ? xstrdup(str) : NULL); | 258 | return (str ? xstrdup(str) : NULL); |
259 | } | 259 | } |
260 | 260 | ||
261 | static void prepare_context(struct cgit_context *ctx) | 261 | static void prepare_context(struct cgit_context *ctx) |
262 | { | 262 | { |
263 | memset(ctx, 0, sizeof(ctx)); | 263 | memset(ctx, 0, sizeof(*ctx)); |
264 | ctx->cfg.agefile = "info/web/last-modified"; | 264 | ctx->cfg.agefile = "info/web/last-modified"; |
265 | ctx->cfg.nocache = 0; | 265 | ctx->cfg.nocache = 0; |
266 | ctx->cfg.cache_size = 0; | 266 | ctx->cfg.cache_size = 0; |
267 | ctx->cfg.cache_dynamic_ttl = 5; | 267 | ctx->cfg.cache_dynamic_ttl = 5; |
268 | ctx->cfg.cache_max_create_time = 5; | 268 | ctx->cfg.cache_max_create_time = 5; |
269 | ctx->cfg.cache_repo_ttl = 5; | 269 | ctx->cfg.cache_repo_ttl = 5; |
270 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 270 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
271 | ctx->cfg.cache_root_ttl = 5; | 271 | ctx->cfg.cache_root_ttl = 5; |
272 | ctx->cfg.cache_scanrc_ttl = 15; | 272 | ctx->cfg.cache_scanrc_ttl = 15; |
273 | ctx->cfg.cache_static_ttl = -1; | 273 | ctx->cfg.cache_static_ttl = -1; |
274 | ctx->cfg.css = "/cgit.css"; | 274 | ctx->cfg.css = "/cgit.css"; |
275 | ctx->cfg.logo = "/cgit.png"; | 275 | ctx->cfg.logo = "/cgit.png"; |
276 | ctx->cfg.local_time = 0; | 276 | ctx->cfg.local_time = 0; |
277 | ctx->cfg.enable_tree_linenumbers = 1; | 277 | ctx->cfg.enable_tree_linenumbers = 1; |
278 | ctx->cfg.max_repo_count = 50; | 278 | ctx->cfg.max_repo_count = 50; |
279 | ctx->cfg.max_commit_count = 50; | 279 | ctx->cfg.max_commit_count = 50; |
280 | ctx->cfg.max_lock_attempts = 5; | 280 | ctx->cfg.max_lock_attempts = 5; |
281 | ctx->cfg.max_msg_len = 80; | 281 | ctx->cfg.max_msg_len = 80; |
282 | ctx->cfg.max_repodesc_len = 80; | 282 | ctx->cfg.max_repodesc_len = 80; |
283 | ctx->cfg.max_blob_size = 0; | 283 | ctx->cfg.max_blob_size = 0; |
284 | ctx->cfg.max_stats = 0; | 284 | ctx->cfg.max_stats = 0; |
285 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 285 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
286 | ctx->cfg.renamelimit = -1; | 286 | ctx->cfg.renamelimit = -1; |
287 | ctx->cfg.robots = "index, nofollow"; | 287 | ctx->cfg.robots = "index, nofollow"; |
288 | ctx->cfg.root_title = "Git repository browser"; | 288 | ctx->cfg.root_title = "Git repository browser"; |
289 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 289 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
290 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 290 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
291 | ctx->cfg.section = ""; | 291 | ctx->cfg.section = ""; |
292 | ctx->cfg.summary_branches = 10; | 292 | ctx->cfg.summary_branches = 10; |
293 | ctx->cfg.summary_log = 10; | 293 | ctx->cfg.summary_log = 10; |
294 | ctx->cfg.summary_tags = 10; | 294 | ctx->cfg.summary_tags = 10; |
295 | ctx->cfg.ssdiff = 0; | 295 | ctx->cfg.ssdiff = 0; |
296 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 296 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
297 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 297 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
298 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 298 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
299 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 299 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
300 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 300 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
301 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 301 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
302 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 302 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
303 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 303 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
304 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 304 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
305 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 305 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
306 | ctx->page.mimetype = "text/html"; | 306 | ctx->page.mimetype = "text/html"; |
307 | ctx->page.charset = PAGE_ENCODING; | 307 | ctx->page.charset = PAGE_ENCODING; |
308 | ctx->page.filename = NULL; | 308 | ctx->page.filename = NULL; |
309 | ctx->page.size = 0; | 309 | ctx->page.size = 0; |
310 | ctx->page.modified = time(NULL); | 310 | ctx->page.modified = time(NULL); |
311 | ctx->page.expires = ctx->page.modified; | 311 | ctx->page.expires = ctx->page.modified; |
312 | ctx->page.etag = NULL; | 312 | ctx->page.etag = NULL; |
313 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 313 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
314 | if (ctx->env.script_name) | 314 | if (ctx->env.script_name) |
315 | ctx->cfg.script_name = ctx->env.script_name; | 315 | ctx->cfg.script_name = ctx->env.script_name; |
316 | if (ctx->env.query_string) | 316 | if (ctx->env.query_string) |
317 | ctx->qry.raw = ctx->env.query_string; | 317 | ctx->qry.raw = ctx->env.query_string; |
318 | if (!ctx->env.cgit_config) | 318 | if (!ctx->env.cgit_config) |
319 | ctx->env.cgit_config = CGIT_CONFIG; | 319 | ctx->env.cgit_config = CGIT_CONFIG; |
320 | } | 320 | } |
321 | 321 | ||
322 | struct refmatch { | 322 | struct refmatch { |
323 | char *req_ref; | 323 | char *req_ref; |
324 | char *first_ref; | 324 | char *first_ref; |
325 | int match; | 325 | int match; |
326 | }; | 326 | }; |
327 | 327 | ||
328 | int find_current_ref(const char *refname, const unsigned char *sha1, | 328 | int find_current_ref(const char *refname, const unsigned char *sha1, |
329 | int flags, void *cb_data) | 329 | int flags, void *cb_data) |
330 | { | 330 | { |
331 | struct refmatch *info; | 331 | struct refmatch *info; |
332 | 332 | ||
333 | info = (struct refmatch *)cb_data; | 333 | info = (struct refmatch *)cb_data; |
334 | if (!strcmp(refname, info->req_ref)) | 334 | if (!strcmp(refname, info->req_ref)) |
335 | info->match = 1; | 335 | info->match = 1; |
336 | if (!info->first_ref) | 336 | if (!info->first_ref) |
337 | info->first_ref = xstrdup(refname); | 337 | info->first_ref = xstrdup(refname); |
338 | return info->match; | 338 | return info->match; |
339 | } | 339 | } |
340 | 340 | ||
341 | char *find_default_branch(struct cgit_repo *repo) | 341 | char *find_default_branch(struct cgit_repo *repo) |
342 | { | 342 | { |
343 | struct refmatch info; | 343 | struct refmatch info; |
344 | char *ref; | 344 | char *ref; |
345 | 345 | ||
346 | info.req_ref = repo->defbranch; | 346 | info.req_ref = repo->defbranch; |
347 | info.first_ref = NULL; | 347 | info.first_ref = NULL; |
348 | info.match = 0; | 348 | info.match = 0; |
349 | for_each_branch_ref(find_current_ref, &info); | 349 | for_each_branch_ref(find_current_ref, &info); |
350 | if (info.match) | 350 | if (info.match) |
351 | ref = info.req_ref; | 351 | ref = info.req_ref; |
352 | else | 352 | else |
353 | ref = info.first_ref; | 353 | ref = info.first_ref; |
354 | if (ref) | 354 | if (ref) |
355 | ref = xstrdup(ref); | 355 | ref = xstrdup(ref); |
356 | return ref; | 356 | return ref; |
357 | } | 357 | } |
358 | 358 | ||
359 | static int prepare_repo_cmd(struct cgit_context *ctx) | 359 | static int prepare_repo_cmd(struct cgit_context *ctx) |
diff --git a/ui-shared.c b/ui-shared.c index 08ea003..8827fff 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -153,310 +153,310 @@ static void site_url(char *page, char *search, int ofs) | |||
153 | html("q="); | 153 | html("q="); |
154 | html_attr(search); | 154 | html_attr(search); |
155 | delim = "&"; | 155 | delim = "&"; |
156 | } | 156 | } |
157 | if (ofs) { | 157 | if (ofs) { |
158 | html(delim); | 158 | html(delim); |
159 | htmlf("ofs=%d", ofs); | 159 | htmlf("ofs=%d", ofs); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | static void site_link(char *page, char *name, char *title, char *class, | 163 | static void site_link(char *page, char *name, char *title, char *class, |
164 | char *search, int ofs) | 164 | char *search, int ofs) |
165 | { | 165 | { |
166 | html("<a"); | 166 | html("<a"); |
167 | if (title) { | 167 | if (title) { |
168 | html(" title='"); | 168 | html(" title='"); |
169 | html_attr(title); | 169 | html_attr(title); |
170 | html("'"); | 170 | html("'"); |
171 | } | 171 | } |
172 | if (class) { | 172 | if (class) { |
173 | html(" class='"); | 173 | html(" class='"); |
174 | html_attr(class); | 174 | html_attr(class); |
175 | html("'"); | 175 | html("'"); |
176 | } | 176 | } |
177 | html(" href='"); | 177 | html(" href='"); |
178 | site_url(page, search, ofs); | 178 | site_url(page, search, ofs); |
179 | html("'>"); | 179 | html("'>"); |
180 | html_txt(name); | 180 | html_txt(name); |
181 | html("</a>"); | 181 | html("</a>"); |
182 | } | 182 | } |
183 | 183 | ||
184 | void cgit_index_link(char *name, char *title, char *class, char *pattern, | 184 | void cgit_index_link(char *name, char *title, char *class, char *pattern, |
185 | int ofs) | 185 | int ofs) |
186 | { | 186 | { |
187 | site_link(NULL, name, title, class, pattern, ofs); | 187 | site_link(NULL, name, title, class, pattern, ofs); |
188 | } | 188 | } |
189 | 189 | ||
190 | static char *repolink(char *title, char *class, char *page, char *head, | 190 | static char *repolink(char *title, char *class, char *page, char *head, |
191 | char *path) | 191 | char *path) |
192 | { | 192 | { |
193 | char *delim = "?"; | 193 | char *delim = "?"; |
194 | 194 | ||
195 | html("<a"); | 195 | html("<a"); |
196 | if (title) { | 196 | if (title) { |
197 | html(" title='"); | 197 | html(" title='"); |
198 | html_attr(title); | 198 | html_attr(title); |
199 | html("'"); | 199 | html("'"); |
200 | } | 200 | } |
201 | if (class) { | 201 | if (class) { |
202 | html(" class='"); | 202 | html(" class='"); |
203 | html_attr(class); | 203 | html_attr(class); |
204 | html("'"); | 204 | html("'"); |
205 | } | 205 | } |
206 | html(" href='"); | 206 | html(" href='"); |
207 | if (ctx.cfg.virtual_root) { | 207 | if (ctx.cfg.virtual_root) { |
208 | html_url_path(ctx.cfg.virtual_root); | 208 | html_url_path(ctx.cfg.virtual_root); |
209 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 209 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
210 | html("/"); | 210 | html("/"); |
211 | html_url_path(ctx.repo->url); | 211 | html_url_path(ctx.repo->url); |
212 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 212 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
213 | html("/"); | 213 | html("/"); |
214 | if (page) { | 214 | if (page) { |
215 | html_url_path(page); | 215 | html_url_path(page); |
216 | html("/"); | 216 | html("/"); |
217 | if (path) | 217 | if (path) |
218 | html_url_path(path); | 218 | html_url_path(path); |
219 | } | 219 | } |
220 | } else { | 220 | } else { |
221 | html(ctx.cfg.script_name); | 221 | html(ctx.cfg.script_name); |
222 | html("?url="); | 222 | html("?url="); |
223 | html_url_arg(ctx.repo->url); | 223 | html_url_arg(ctx.repo->url); |
224 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 224 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
225 | html("/"); | 225 | html("/"); |
226 | if (page) { | 226 | if (page) { |
227 | html_url_arg(page); | 227 | html_url_arg(page); |
228 | html("/"); | 228 | html("/"); |
229 | if (path) | 229 | if (path) |
230 | html_url_arg(path); | 230 | html_url_arg(path); |
231 | } | 231 | } |
232 | delim = "&"; | 232 | delim = "&"; |
233 | } | 233 | } |
234 | if (head && strcmp(head, ctx.repo->defbranch)) { | 234 | if (head && strcmp(head, ctx.repo->defbranch)) { |
235 | html(delim); | 235 | html(delim); |
236 | html("h="); | 236 | html("h="); |
237 | html_url_arg(head); | 237 | html_url_arg(head); |
238 | delim = "&"; | 238 | delim = "&"; |
239 | } | 239 | } |
240 | return fmt("%s", delim); | 240 | return fmt("%s", delim); |
241 | } | 241 | } |
242 | 242 | ||
243 | static void reporevlink(char *page, char *name, char *title, char *class, | 243 | static void reporevlink(char *page, char *name, char *title, char *class, |
244 | char *head, char *rev, char *path) | 244 | char *head, char *rev, char *path) |
245 | { | 245 | { |
246 | char *delim; | 246 | char *delim; |
247 | 247 | ||
248 | delim = repolink(title, class, page, head, path); | 248 | delim = repolink(title, class, page, head, path); |
249 | if (rev && strcmp(rev, ctx.qry.head)) { | 249 | if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) { |
250 | html(delim); | 250 | html(delim); |
251 | html("id="); | 251 | html("id="); |
252 | html_url_arg(rev); | 252 | html_url_arg(rev); |
253 | } | 253 | } |
254 | html("'>"); | 254 | html("'>"); |
255 | html_txt(name); | 255 | html_txt(name); |
256 | html("</a>"); | 256 | html("</a>"); |
257 | } | 257 | } |
258 | 258 | ||
259 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 259 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
260 | { | 260 | { |
261 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 261 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
262 | } | 262 | } |
263 | 263 | ||
264 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 264 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
265 | char *rev) | 265 | char *rev) |
266 | { | 266 | { |
267 | reporevlink("tag", name, title, class, head, rev, NULL); | 267 | reporevlink("tag", name, title, class, head, rev, NULL); |
268 | } | 268 | } |
269 | 269 | ||
270 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 270 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
271 | char *rev, char *path) | 271 | char *rev, char *path) |
272 | { | 272 | { |
273 | reporevlink("tree", name, title, class, head, rev, path); | 273 | reporevlink("tree", name, title, class, head, rev, path); |
274 | } | 274 | } |
275 | 275 | ||
276 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 276 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
277 | char *rev, char *path) | 277 | char *rev, char *path) |
278 | { | 278 | { |
279 | reporevlink("plain", name, title, class, head, rev, path); | 279 | reporevlink("plain", name, title, class, head, rev, path); |
280 | } | 280 | } |
281 | 281 | ||
282 | void cgit_log_link(char *name, char *title, char *class, char *head, | 282 | void cgit_log_link(char *name, char *title, char *class, char *head, |
283 | char *rev, char *path, int ofs, char *grep, char *pattern, | 283 | char *rev, char *path, int ofs, char *grep, char *pattern, |
284 | int showmsg) | 284 | int showmsg) |
285 | { | 285 | { |
286 | char *delim; | 286 | char *delim; |
287 | 287 | ||
288 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 290 | html(delim); |
291 | html("id="); | 291 | html("id="); |
292 | html_url_arg(rev); | 292 | html_url_arg(rev); |
293 | delim = "&"; | 293 | delim = "&"; |
294 | } | 294 | } |
295 | if (grep && pattern) { | 295 | if (grep && pattern) { |
296 | html(delim); | 296 | html(delim); |
297 | html("qt="); | 297 | html("qt="); |
298 | html_url_arg(grep); | 298 | html_url_arg(grep); |
299 | delim = "&"; | 299 | delim = "&"; |
300 | html(delim); | 300 | html(delim); |
301 | html("q="); | 301 | html("q="); |
302 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
303 | } | 303 | } |
304 | if (ofs > 0) { | 304 | if (ofs > 0) { |
305 | html(delim); | 305 | html(delim); |
306 | html("ofs="); | 306 | html("ofs="); |
307 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
308 | delim = "&"; | 308 | delim = "&"; |
309 | } | 309 | } |
310 | if (showmsg) { | 310 | if (showmsg) { |
311 | html(delim); | 311 | html(delim); |
312 | html("showmsg=1"); | 312 | html("showmsg=1"); |
313 | } | 313 | } |
314 | html("'>"); | 314 | html("'>"); |
315 | html_txt(name); | 315 | html_txt(name); |
316 | html("</a>"); | 316 | html("</a>"); |
317 | } | 317 | } |
318 | 318 | ||
319 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 319 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
320 | char *rev, int toggle_ssdiff) | 320 | char *rev, int toggle_ssdiff) |
321 | { | 321 | { |
322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
323 | name[ctx.cfg.max_msg_len] = '\0'; | 323 | name[ctx.cfg.max_msg_len] = '\0'; |
324 | name[ctx.cfg.max_msg_len - 1] = '.'; | 324 | name[ctx.cfg.max_msg_len - 1] = '.'; |
325 | name[ctx.cfg.max_msg_len - 2] = '.'; | 325 | name[ctx.cfg.max_msg_len - 2] = '.'; |
326 | name[ctx.cfg.max_msg_len - 3] = '.'; | 326 | name[ctx.cfg.max_msg_len - 3] = '.'; |
327 | } | 327 | } |
328 | 328 | ||
329 | char *delim; | 329 | char *delim; |
330 | 330 | ||
331 | delim = repolink(title, class, "commit", head, NULL); | 331 | delim = repolink(title, class, "commit", head, NULL); |
332 | if (rev && strcmp(rev, ctx.qry.head)) { | 332 | if (rev && strcmp(rev, ctx.qry.head)) { |
333 | html(delim); | 333 | html(delim); |
334 | html("id="); | 334 | html("id="); |
335 | html_url_arg(rev); | 335 | html_url_arg(rev); |
336 | delim = "&"; | 336 | delim = "&"; |
337 | } | 337 | } |
338 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | 338 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { |
339 | html(delim); | 339 | html(delim); |
340 | html("ss=1"); | 340 | html("ss=1"); |
341 | } | 341 | } |
342 | html("'>"); | 342 | html("'>"); |
343 | html_txt(name); | 343 | html_txt(name); |
344 | html("</a>"); | 344 | html("</a>"); |
345 | } | 345 | } |
346 | 346 | ||
347 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 347 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
348 | char *rev, char *path) | 348 | char *rev, char *path) |
349 | { | 349 | { |
350 | reporevlink("refs", name, title, class, head, rev, path); | 350 | reporevlink("refs", name, title, class, head, rev, path); |
351 | } | 351 | } |
352 | 352 | ||
353 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 353 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
354 | char *rev, char *archivename) | 354 | char *rev, char *archivename) |
355 | { | 355 | { |
356 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 356 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
357 | } | 357 | } |
358 | 358 | ||
359 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 359 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
360 | char *new_rev, char *old_rev, char *path, | 360 | char *new_rev, char *old_rev, char *path, |
361 | int toggle_ssdiff) | 361 | int toggle_ssdiff) |
362 | { | 362 | { |
363 | char *delim; | 363 | char *delim; |
364 | 364 | ||
365 | delim = repolink(title, class, "diff", head, path); | 365 | delim = repolink(title, class, "diff", head, path); |
366 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 366 | if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) { |
367 | html(delim); | 367 | html(delim); |
368 | html("id="); | 368 | html("id="); |
369 | html_url_arg(new_rev); | 369 | html_url_arg(new_rev); |
370 | delim = "&"; | 370 | delim = "&"; |
371 | } | 371 | } |
372 | if (old_rev) { | 372 | if (old_rev) { |
373 | html(delim); | 373 | html(delim); |
374 | html("id2="); | 374 | html("id2="); |
375 | html_url_arg(old_rev); | 375 | html_url_arg(old_rev); |
376 | delim = "&"; | 376 | delim = "&"; |
377 | } | 377 | } |
378 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { | 378 | if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { |
379 | html(delim); | 379 | html(delim); |
380 | html("ss=1"); | 380 | html("ss=1"); |
381 | } | 381 | } |
382 | html("'>"); | 382 | html("'>"); |
383 | html_txt(name); | 383 | html_txt(name); |
384 | html("</a>"); | 384 | html("</a>"); |
385 | } | 385 | } |
386 | 386 | ||
387 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 387 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
388 | char *rev) | 388 | char *rev) |
389 | { | 389 | { |
390 | reporevlink("patch", name, title, class, head, rev, NULL); | 390 | reporevlink("patch", name, title, class, head, rev, NULL); |
391 | } | 391 | } |
392 | 392 | ||
393 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 393 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
394 | char *path) | 394 | char *path) |
395 | { | 395 | { |
396 | reporevlink("stats", name, title, class, head, NULL, path); | 396 | reporevlink("stats", name, title, class, head, NULL, path); |
397 | } | 397 | } |
398 | 398 | ||
399 | void cgit_object_link(struct object *obj) | 399 | void cgit_object_link(struct object *obj) |
400 | { | 400 | { |
401 | char *page, *shortrev, *fullrev, *name; | 401 | char *page, *shortrev, *fullrev, *name; |
402 | 402 | ||
403 | fullrev = sha1_to_hex(obj->sha1); | 403 | fullrev = sha1_to_hex(obj->sha1); |
404 | shortrev = xstrdup(fullrev); | 404 | shortrev = xstrdup(fullrev); |
405 | shortrev[10] = '\0'; | 405 | shortrev[10] = '\0'; |
406 | if (obj->type == OBJ_COMMIT) { | 406 | if (obj->type == OBJ_COMMIT) { |
407 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 407 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
408 | ctx.qry.head, fullrev, 0); | 408 | ctx.qry.head, fullrev, 0); |
409 | return; | 409 | return; |
410 | } else if (obj->type == OBJ_TREE) | 410 | } else if (obj->type == OBJ_TREE) |
411 | page = "tree"; | 411 | page = "tree"; |
412 | else if (obj->type == OBJ_TAG) | 412 | else if (obj->type == OBJ_TAG) |
413 | page = "tag"; | 413 | page = "tag"; |
414 | else | 414 | else |
415 | page = "blob"; | 415 | page = "blob"; |
416 | name = fmt("%s %s...", typename(obj->type), shortrev); | 416 | name = fmt("%s %s...", typename(obj->type), shortrev); |
417 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 417 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
418 | } | 418 | } |
419 | 419 | ||
420 | void cgit_print_date(time_t secs, char *format, int local_time) | 420 | void cgit_print_date(time_t secs, char *format, int local_time) |
421 | { | 421 | { |
422 | char buf[64]; | 422 | char buf[64]; |
423 | struct tm *time; | 423 | struct tm *time; |
424 | 424 | ||
425 | if (!secs) | 425 | if (!secs) |
426 | return; | 426 | return; |
427 | if(local_time) | 427 | if(local_time) |
428 | time = localtime(&secs); | 428 | time = localtime(&secs); |
429 | else | 429 | else |
430 | time = gmtime(&secs); | 430 | time = gmtime(&secs); |
431 | strftime(buf, sizeof(buf)-1, format, time); | 431 | strftime(buf, sizeof(buf)-1, format, time); |
432 | html_txt(buf); | 432 | html_txt(buf); |
433 | } | 433 | } |
434 | 434 | ||
435 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 435 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
436 | { | 436 | { |
437 | time_t now, secs; | 437 | time_t now, secs; |
438 | 438 | ||
439 | if (!t) | 439 | if (!t) |
440 | return; | 440 | return; |
441 | time(&now); | 441 | time(&now); |
442 | secs = now - t; | 442 | secs = now - t; |
443 | 443 | ||
444 | if (secs > max_relative && max_relative >= 0) { | 444 | if (secs > max_relative && max_relative >= 0) { |
445 | cgit_print_date(t, format, ctx.cfg.local_time); | 445 | cgit_print_date(t, format, ctx.cfg.local_time); |
446 | return; | 446 | return; |
447 | } | 447 | } |
448 | 448 | ||
449 | if (secs < TM_HOUR * 2) { | 449 | if (secs < TM_HOUR * 2) { |
450 | htmlf("<span class='age-mins'>%.0f min.</span>", | 450 | htmlf("<span class='age-mins'>%.0f min.</span>", |
451 | secs * 1.0 / TM_MIN); | 451 | secs * 1.0 / TM_MIN); |
452 | return; | 452 | return; |
453 | } | 453 | } |
454 | if (secs < TM_DAY * 2) { | 454 | if (secs < TM_DAY * 2) { |
455 | htmlf("<span class='age-hours'>%.0f hours</span>", | 455 | htmlf("<span class='age-hours'>%.0f hours</span>", |
456 | secs * 1.0 / TM_HOUR); | 456 | secs * 1.0 / TM_HOUR); |
457 | return; | 457 | return; |
458 | } | 458 | } |
459 | if (secs < TM_WEEK * 2) { | 459 | if (secs < TM_WEEK * 2) { |
460 | htmlf("<span class='age-days'>%.0f days</span>", | 460 | htmlf("<span class='age-days'>%.0f days</span>", |
461 | secs * 1.0 / TM_DAY); | 461 | secs * 1.0 / TM_DAY); |
462 | return; | 462 | return; |