|
diff --git a/cgit.c b/cgit.c index 9305d0a..6ccf4aa 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -33,64 +33,66 @@ struct cgit_filter *new_filter(const char *cmd, int extra_args) |
33 | return NULL; |
33 | return NULL; |
34 | |
34 | |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
35 | f = xmalloc(sizeof(struct cgit_filter)); |
36 | f->cmd = xstrdup(cmd); |
36 | f->cmd = xstrdup(cmd); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
37 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
38 | f->argv[0] = f->cmd; |
38 | f->argv[0] = f->cmd; |
39 | f->argv[1] = NULL; |
39 | f->argv[1] = NULL; |
40 | return f; |
40 | return f; |
41 | } |
41 | } |
42 | |
42 | |
43 | static void process_cached_repolist(const char *path); |
43 | static void process_cached_repolist(const char *path); |
44 | |
44 | |
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
45 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
46 | { |
46 | { |
47 | if (!strcmp(name, "name")) |
47 | if (!strcmp(name, "name")) |
48 | repo->name = xstrdup(value); |
48 | repo->name = xstrdup(value); |
49 | else if (!strcmp(name, "clone-url")) |
49 | else if (!strcmp(name, "clone-url")) |
50 | repo->clone_url = xstrdup(value); |
50 | repo->clone_url = xstrdup(value); |
51 | else if (!strcmp(name, "desc")) |
51 | else if (!strcmp(name, "desc")) |
52 | repo->desc = xstrdup(value); |
52 | repo->desc = xstrdup(value); |
53 | else if (!strcmp(name, "owner")) |
53 | else if (!strcmp(name, "owner")) |
54 | repo->owner = xstrdup(value); |
54 | repo->owner = xstrdup(value); |
55 | else if (!strcmp(name, "defbranch")) |
55 | else if (!strcmp(name, "defbranch")) |
56 | repo->defbranch = xstrdup(value); |
56 | repo->defbranch = xstrdup(value); |
57 | else if (!strcmp(name, "snapshots")) |
57 | else if (!strcmp(name, "snapshots")) |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
59 | else if (!strcmp(name, "enable-log-filecount")) |
59 | else if (!strcmp(name, "enable-log-filecount")) |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) |
61 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | else if (!strcmp(name, "enable-remote-branches")) |
63 | else if (!strcmp(name, "enable-remote-branches")) |
64 | repo->enable_remote_branches = atoi(value); |
64 | repo->enable_remote_branches = atoi(value); |
| |
65 | else if (!strcmp(name, "enable-subject-links")) |
| |
66 | repo->enable_subject_links = atoi(value); |
65 | else if (!strcmp(name, "max-stats")) |
67 | else if (!strcmp(name, "max-stats")) |
66 | repo->max_stats = cgit_find_stats_period(value, NULL); |
68 | repo->max_stats = cgit_find_stats_period(value, NULL); |
67 | else if (!strcmp(name, "module-link")) |
69 | else if (!strcmp(name, "module-link")) |
68 | repo->module_link= xstrdup(value); |
70 | repo->module_link= xstrdup(value); |
69 | else if (!strcmp(name, "section")) |
71 | else if (!strcmp(name, "section")) |
70 | repo->section = xstrdup(value); |
72 | repo->section = xstrdup(value); |
71 | else if (!strcmp(name, "readme") && value != NULL) { |
73 | else if (!strcmp(name, "readme") && value != NULL) { |
72 | if (*value == '/') |
74 | if (*value == '/') |
73 | repo->readme = xstrdup(value); |
75 | repo->readme = xstrdup(value); |
74 | else |
76 | else |
75 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
77 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
78 | } else if (ctx.cfg.enable_filter_overrides) { |
77 | if (!strcmp(name, "about-filter")) |
79 | if (!strcmp(name, "about-filter")) |
78 | repo->about_filter = new_filter(value, 0); |
80 | repo->about_filter = new_filter(value, 0); |
79 | else if (!strcmp(name, "commit-filter")) |
81 | else if (!strcmp(name, "commit-filter")) |
80 | repo->commit_filter = new_filter(value, 0); |
82 | repo->commit_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "source-filter")) |
83 | else if (!strcmp(name, "source-filter")) |
82 | repo->source_filter = new_filter(value, 1); |
84 | repo->source_filter = new_filter(value, 1); |
83 | } |
85 | } |
84 | } |
86 | } |
85 | |
87 | |
86 | void config_cb(const char *name, const char *value) |
88 | void config_cb(const char *name, const char *value) |
87 | { |
89 | { |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
90 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
89 | ctx.cfg.section = xstrdup(value); |
91 | ctx.cfg.section = xstrdup(value); |
90 | else if (!strcmp(name, "repo.url")) |
92 | else if (!strcmp(name, "repo.url")) |
91 | ctx.repo = cgit_add_repo(value); |
93 | ctx.repo = cgit_add_repo(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
94 | else if (ctx.repo && !strcmp(name, "repo.path")) |
93 | ctx.repo->path = trim_end(value, '/'); |
95 | ctx.repo->path = trim_end(value, '/'); |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
96 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
95 | repo_config(ctx.repo, name + 5, value); |
97 | repo_config(ctx.repo, name + 5, value); |
96 | else if (!strcmp(name, "root-title")) |
98 | else if (!strcmp(name, "root-title")) |
@@ -112,64 +114,66 @@ void config_cb(const char *name, const char *value) |
112 | else if (!strcmp(name, "logo")) |
114 | else if (!strcmp(name, "logo")) |
113 | ctx.cfg.logo = xstrdup(value); |
115 | ctx.cfg.logo = xstrdup(value); |
114 | else if (!strcmp(name, "index-header")) |
116 | else if (!strcmp(name, "index-header")) |
115 | ctx.cfg.index_header = xstrdup(value); |
117 | ctx.cfg.index_header = xstrdup(value); |
116 | else if (!strcmp(name, "index-info")) |
118 | else if (!strcmp(name, "index-info")) |
117 | ctx.cfg.index_info = xstrdup(value); |
119 | ctx.cfg.index_info = xstrdup(value); |
118 | else if (!strcmp(name, "logo-link")) |
120 | else if (!strcmp(name, "logo-link")) |
119 | ctx.cfg.logo_link = xstrdup(value); |
121 | ctx.cfg.logo_link = xstrdup(value); |
120 | else if (!strcmp(name, "module-link")) |
122 | else if (!strcmp(name, "module-link")) |
121 | ctx.cfg.module_link = xstrdup(value); |
123 | ctx.cfg.module_link = xstrdup(value); |
122 | else if (!strcmp(name, "virtual-root")) { |
124 | else if (!strcmp(name, "virtual-root")) { |
123 | ctx.cfg.virtual_root = trim_end(value, '/'); |
125 | ctx.cfg.virtual_root = trim_end(value, '/'); |
124 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
125 | ctx.cfg.virtual_root = ""; |
127 | ctx.cfg.virtual_root = ""; |
126 | } else if (!strcmp(name, "nocache")) |
128 | } else if (!strcmp(name, "nocache")) |
127 | ctx.cfg.nocache = atoi(value); |
129 | ctx.cfg.nocache = atoi(value); |
128 | else if (!strcmp(name, "noplainemail")) |
130 | else if (!strcmp(name, "noplainemail")) |
129 | ctx.cfg.noplainemail = atoi(value); |
131 | ctx.cfg.noplainemail = atoi(value); |
130 | else if (!strcmp(name, "noheader")) |
132 | else if (!strcmp(name, "noheader")) |
131 | ctx.cfg.noheader = atoi(value); |
133 | ctx.cfg.noheader = atoi(value); |
132 | else if (!strcmp(name, "snapshots")) |
134 | else if (!strcmp(name, "snapshots")) |
133 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
134 | else if (!strcmp(name, "enable-filter-overrides")) |
136 | else if (!strcmp(name, "enable-filter-overrides")) |
135 | ctx.cfg.enable_filter_overrides = atoi(value); |
137 | ctx.cfg.enable_filter_overrides = atoi(value); |
136 | else if (!strcmp(name, "enable-index-links")) |
138 | else if (!strcmp(name, "enable-index-links")) |
137 | ctx.cfg.enable_index_links = atoi(value); |
139 | ctx.cfg.enable_index_links = atoi(value); |
138 | else if (!strcmp(name, "enable-log-filecount")) |
140 | else if (!strcmp(name, "enable-log-filecount")) |
139 | ctx.cfg.enable_log_filecount = atoi(value); |
141 | ctx.cfg.enable_log_filecount = atoi(value); |
140 | else if (!strcmp(name, "enable-log-linecount")) |
142 | else if (!strcmp(name, "enable-log-linecount")) |
141 | ctx.cfg.enable_log_linecount = atoi(value); |
143 | ctx.cfg.enable_log_linecount = atoi(value); |
142 | else if (!strcmp(name, "enable-remote-branches")) |
144 | else if (!strcmp(name, "enable-remote-branches")) |
143 | ctx.cfg.enable_remote_branches = atoi(value); |
145 | ctx.cfg.enable_remote_branches = atoi(value); |
| |
146 | else if (!strcmp(name, "enable-subject-links")) |
| |
147 | ctx.cfg.enable_subject_links = atoi(value); |
144 | else if (!strcmp(name, "enable-tree-linenumbers")) |
148 | else if (!strcmp(name, "enable-tree-linenumbers")) |
145 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
146 | else if (!strcmp(name, "max-stats")) |
150 | else if (!strcmp(name, "max-stats")) |
147 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
148 | else if (!strcmp(name, "cache-size")) |
152 | else if (!strcmp(name, "cache-size")) |
149 | ctx.cfg.cache_size = atoi(value); |
153 | ctx.cfg.cache_size = atoi(value); |
150 | else if (!strcmp(name, "cache-root")) |
154 | else if (!strcmp(name, "cache-root")) |
151 | ctx.cfg.cache_root = xstrdup(value); |
155 | ctx.cfg.cache_root = xstrdup(value); |
152 | else if (!strcmp(name, "cache-root-ttl")) |
156 | else if (!strcmp(name, "cache-root-ttl")) |
153 | ctx.cfg.cache_root_ttl = atoi(value); |
157 | ctx.cfg.cache_root_ttl = atoi(value); |
154 | else if (!strcmp(name, "cache-repo-ttl")) |
158 | else if (!strcmp(name, "cache-repo-ttl")) |
155 | ctx.cfg.cache_repo_ttl = atoi(value); |
159 | ctx.cfg.cache_repo_ttl = atoi(value); |
156 | else if (!strcmp(name, "cache-scanrc-ttl")) |
160 | else if (!strcmp(name, "cache-scanrc-ttl")) |
157 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
161 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
158 | else if (!strcmp(name, "cache-static-ttl")) |
162 | else if (!strcmp(name, "cache-static-ttl")) |
159 | ctx.cfg.cache_static_ttl = atoi(value); |
163 | ctx.cfg.cache_static_ttl = atoi(value); |
160 | else if (!strcmp(name, "cache-dynamic-ttl")) |
164 | else if (!strcmp(name, "cache-dynamic-ttl")) |
161 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
165 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
162 | else if (!strcmp(name, "about-filter")) |
166 | else if (!strcmp(name, "about-filter")) |
163 | ctx.cfg.about_filter = new_filter(value, 0); |
167 | ctx.cfg.about_filter = new_filter(value, 0); |
164 | else if (!strcmp(name, "commit-filter")) |
168 | else if (!strcmp(name, "commit-filter")) |
165 | ctx.cfg.commit_filter = new_filter(value, 0); |
169 | ctx.cfg.commit_filter = new_filter(value, 0); |
166 | else if (!strcmp(name, "embedded")) |
170 | else if (!strcmp(name, "embedded")) |
167 | ctx.cfg.embedded = atoi(value); |
171 | ctx.cfg.embedded = atoi(value); |
168 | else if (!strcmp(name, "max-message-length")) |
172 | else if (!strcmp(name, "max-message-length")) |
169 | ctx.cfg.max_msg_len = atoi(value); |
173 | ctx.cfg.max_msg_len = atoi(value); |
170 | else if (!strcmp(name, "max-repodesc-length")) |
174 | else if (!strcmp(name, "max-repodesc-length")) |
171 | ctx.cfg.max_repodesc_len = atoi(value); |
175 | ctx.cfg.max_repodesc_len = atoi(value); |
172 | else if (!strcmp(name, "max-blob-size")) |
176 | else if (!strcmp(name, "max-blob-size")) |
173 | ctx.cfg.max_blob_size = atoi(value); |
177 | ctx.cfg.max_blob_size = atoi(value); |
174 | else if (!strcmp(name, "max-repo-count")) |
178 | else if (!strcmp(name, "max-repo-count")) |
175 | ctx.cfg.max_repo_count = atoi(value); |
179 | ctx.cfg.max_repo_count = atoi(value); |
|