summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index f4dd6ef..e302a7c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,88 +1,90 @@
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 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> 4 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
5 * 5 *
6 * Licensed under GNU General Public License v2 6 * Licensed under GNU General Public License v2
7 * (see COPYING for full license text) 7 * (see COPYING for full license text)
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "cache.h" 11#include "cache.h"
12#include "cmd.h" 12#include "cmd.h"
13#include "configfile.h" 13#include "configfile.h"
14#include "html.h" 14#include "html.h"
15#include "ui-shared.h" 15#include "ui-shared.h"
16#include "ui-stats.h" 16#include "ui-stats.h"
17#include "scan-tree.h" 17#include "scan-tree.h"
18 18
19const char *cgit_version = CGIT_VERSION; 19const char *cgit_version = CGIT_VERSION;
20 20
21void add_mimetype(const char *name, const char *value) 21void add_mimetype(const char *name, const char *value)
22{ 22{
23 struct string_list_item *item; 23 struct string_list_item *item;
24 24
25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); 25 item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name));
26 item->util = xstrdup(value); 26 item->util = xstrdup(value);
27} 27}
28 28
29struct cgit_filter *new_filter(const char *cmd, int extra_args) 29struct cgit_filter *new_filter(const char *cmd, int extra_args)
30{ 30{
31 struct cgit_filter *f; 31 struct cgit_filter *f;
32 int args_size = 0;
32 33
33 if (!cmd || !cmd[0]) 34 if (!cmd || !cmd[0])
34 return NULL; 35 return NULL;
35 36
36 f = xmalloc(sizeof(struct cgit_filter)); 37 f = xmalloc(sizeof(struct cgit_filter));
37 f->cmd = xstrdup(cmd); 38 f->cmd = xstrdup(cmd);
38 f->argv = xmalloc((2 + extra_args) * sizeof(char *)); 39 args_size = (2 + extra_args) * sizeof(char *);
40 f->argv = xmalloc(args_size);
41 memset(f->argv, 0, args_size);
39 f->argv[0] = f->cmd; 42 f->argv[0] = f->cmd;
40 f->argv[1] = NULL;
41 return f; 43 return f;
42} 44}
43 45
44static void process_cached_repolist(const char *path); 46static void process_cached_repolist(const char *path);
45 47
46void repo_config(struct cgit_repo *repo, const char *name, const char *value) 48void repo_config(struct cgit_repo *repo, const char *name, const char *value)
47{ 49{
48 if (!strcmp(name, "name")) 50 if (!strcmp(name, "name"))
49 repo->name = xstrdup(value); 51 repo->name = xstrdup(value);
50 else if (!strcmp(name, "clone-url")) 52 else if (!strcmp(name, "clone-url"))
51 repo->clone_url = xstrdup(value); 53 repo->clone_url = xstrdup(value);
52 else if (!strcmp(name, "desc")) 54 else if (!strcmp(name, "desc"))
53 repo->desc = xstrdup(value); 55 repo->desc = xstrdup(value);
54 else if (!strcmp(name, "owner")) 56 else if (!strcmp(name, "owner"))
55 repo->owner = xstrdup(value); 57 repo->owner = xstrdup(value);
56 else if (!strcmp(name, "defbranch")) 58 else if (!strcmp(name, "defbranch"))
57 repo->defbranch = xstrdup(value); 59 repo->defbranch = xstrdup(value);
58 else if (!strcmp(name, "snapshots")) 60 else if (!strcmp(name, "snapshots"))
59 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); 61 repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
60 else if (!strcmp(name, "enable-commit-graph")) 62 else if (!strcmp(name, "enable-commit-graph"))
61 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); 63 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
62 else if (!strcmp(name, "enable-log-filecount")) 64 else if (!strcmp(name, "enable-log-filecount"))
63 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 65 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
64 else if (!strcmp(name, "enable-log-linecount")) 66 else if (!strcmp(name, "enable-log-linecount"))
65 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 67 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
66 else if (!strcmp(name, "enable-remote-branches")) 68 else if (!strcmp(name, "enable-remote-branches"))
67 repo->enable_remote_branches = atoi(value); 69 repo->enable_remote_branches = atoi(value);
68 else if (!strcmp(name, "enable-subject-links")) 70 else if (!strcmp(name, "enable-subject-links"))
69 repo->enable_subject_links = atoi(value); 71 repo->enable_subject_links = atoi(value);
70 else if (!strcmp(name, "max-stats")) 72 else if (!strcmp(name, "max-stats"))
71 repo->max_stats = cgit_find_stats_period(value, NULL); 73 repo->max_stats = cgit_find_stats_period(value, NULL);
72 else if (!strcmp(name, "module-link")) 74 else if (!strcmp(name, "module-link"))
73 repo->module_link= xstrdup(value); 75 repo->module_link= xstrdup(value);
74 else if (!strcmp(name, "section")) 76 else if (!strcmp(name, "section"))
75 repo->section = xstrdup(value); 77 repo->section = xstrdup(value);
76 else if (!strcmp(name, "readme") && value != NULL) 78 else if (!strcmp(name, "readme") && value != NULL)
77 repo->readme = xstrdup(value); 79 repo->readme = xstrdup(value);
78 else if (!strcmp(name, "logo") && value != NULL) 80 else if (!strcmp(name, "logo") && value != NULL)
79 repo->logo = xstrdup(value); 81 repo->logo = xstrdup(value);
80 else if (!strcmp(name, "logo-link") && value != NULL) 82 else if (!strcmp(name, "logo-link") && value != NULL)
81 repo->logo_link = xstrdup(value); 83 repo->logo_link = xstrdup(value);
82 else if (ctx.cfg.enable_filter_overrides) { 84 else if (ctx.cfg.enable_filter_overrides) {
83 if (!strcmp(name, "about-filter")) 85 if (!strcmp(name, "about-filter"))
84 repo->about_filter = new_filter(value, 0); 86 repo->about_filter = new_filter(value, 0);
85 else if (!strcmp(name, "commit-filter")) 87 else if (!strcmp(name, "commit-filter"))
86 repo->commit_filter = new_filter(value, 0); 88 repo->commit_filter = new_filter(value, 0);
87 else if (!strcmp(name, "source-filter")) 89 else if (!strcmp(name, "source-filter"))
88 repo->source_filter = new_filter(value, 1); 90 repo->source_filter = new_filter(value, 1);