author | Jason A. Donenfeld <Jason@zx2c4.com> | 2010-07-29 17:47:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:09:32 (UTC) |
commit | 2e4a941626c240bc7858aa7564882c01f657f4e8 (patch) (unidiff) | |
tree | 505c17fab5afcb99cfddf2c4aad0b95c8670f001 /cgit.c | |
parent | 3516502aa0df95ecc241caa30161741f59e4e600 (diff) | |
download | cgit-2e4a941626c240bc7858aa7564882c01f657f4e8.zip cgit-2e4a941626c240bc7858aa7564882c01f657f4e8.tar.gz cgit-2e4a941626c240bc7858aa7564882c01f657f4e8.tar.bz2 |
Add support for 'remove-suffix' option
When this option is enabled, the '.git' suffix of repository directories
found while processing the 'scan-path' option will be removed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,768 +1,771 @@ | |||
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 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | void add_mimetype(const char *name, const char *value) | 20 | void add_mimetype(const char *name, const char *value) |
21 | { | 21 | { |
22 | struct string_list_item *item; | 22 | struct string_list_item *item; |
23 | 23 | ||
24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); | 24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); |
25 | item->util = xstrdup(value); | 25 | item->util = xstrdup(value); |
26 | } | 26 | } |
27 | 27 | ||
28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | 28 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
29 | { | 29 | { |
30 | struct cgit_filter *f; | 30 | struct cgit_filter *f; |
31 | 31 | ||
32 | if (!cmd || !cmd[0]) | 32 | if (!cmd || !cmd[0]) |
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")) | 65 | else if (!strcmp(name, "enable-subject-links")) |
66 | repo->enable_subject_links = atoi(value); | 66 | repo->enable_subject_links = atoi(value); |
67 | else if (!strcmp(name, "max-stats")) | 67 | else if (!strcmp(name, "max-stats")) |
68 | repo->max_stats = cgit_find_stats_period(value, NULL); | 68 | repo->max_stats = cgit_find_stats_period(value, NULL); |
69 | else if (!strcmp(name, "module-link")) | 69 | else if (!strcmp(name, "module-link")) |
70 | repo->module_link= xstrdup(value); | 70 | repo->module_link= xstrdup(value); |
71 | else if (!strcmp(name, "section")) | 71 | else if (!strcmp(name, "section")) |
72 | repo->section = xstrdup(value); | 72 | repo->section = xstrdup(value); |
73 | else if (!strcmp(name, "readme") && value != NULL) { | 73 | else if (!strcmp(name, "readme") && value != NULL) { |
74 | if (*value == '/') | 74 | if (*value == '/') |
75 | repo->readme = xstrdup(value); | 75 | repo->readme = xstrdup(value); |
76 | else | 76 | else |
77 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); | 77 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
78 | } else if (ctx.cfg.enable_filter_overrides) { | 78 | } else if (ctx.cfg.enable_filter_overrides) { |
79 | if (!strcmp(name, "about-filter")) | 79 | if (!strcmp(name, "about-filter")) |
80 | repo->about_filter = new_filter(value, 0); | 80 | repo->about_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "commit-filter")) | 81 | else if (!strcmp(name, "commit-filter")) |
82 | repo->commit_filter = new_filter(value, 0); | 82 | repo->commit_filter = new_filter(value, 0); |
83 | else if (!strcmp(name, "source-filter")) | 83 | else if (!strcmp(name, "source-filter")) |
84 | repo->source_filter = new_filter(value, 1); | 84 | repo->source_filter = new_filter(value, 1); |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | void config_cb(const char *name, const char *value) | 88 | void config_cb(const char *name, const char *value) |
89 | { | 89 | { |
90 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) | 90 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
91 | ctx.cfg.section = xstrdup(value); | 91 | ctx.cfg.section = xstrdup(value); |
92 | else if (!strcmp(name, "repo.url")) | 92 | else if (!strcmp(name, "repo.url")) |
93 | ctx.repo = cgit_add_repo(value); | 93 | ctx.repo = cgit_add_repo(value); |
94 | else if (ctx.repo && !strcmp(name, "repo.path")) | 94 | else if (ctx.repo && !strcmp(name, "repo.path")) |
95 | ctx.repo->path = trim_end(value, '/'); | 95 | ctx.repo->path = trim_end(value, '/'); |
96 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 96 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
97 | repo_config(ctx.repo, name + 5, value); | 97 | repo_config(ctx.repo, name + 5, value); |
98 | else if (!strcmp(name, "root-title")) | 98 | else if (!strcmp(name, "root-title")) |
99 | ctx.cfg.root_title = xstrdup(value); | 99 | ctx.cfg.root_title = xstrdup(value); |
100 | else if (!strcmp(name, "root-desc")) | 100 | else if (!strcmp(name, "root-desc")) |
101 | ctx.cfg.root_desc = xstrdup(value); | 101 | ctx.cfg.root_desc = xstrdup(value); |
102 | else if (!strcmp(name, "root-readme")) | 102 | else if (!strcmp(name, "root-readme")) |
103 | ctx.cfg.root_readme = xstrdup(value); | 103 | ctx.cfg.root_readme = xstrdup(value); |
104 | else if (!strcmp(name, "css")) | 104 | else if (!strcmp(name, "css")) |
105 | ctx.cfg.css = xstrdup(value); | 105 | ctx.cfg.css = xstrdup(value); |
106 | else if (!strcmp(name, "favicon")) | 106 | else if (!strcmp(name, "favicon")) |
107 | ctx.cfg.favicon = xstrdup(value); | 107 | ctx.cfg.favicon = xstrdup(value); |
108 | else if (!strcmp(name, "footer")) | 108 | else if (!strcmp(name, "footer")) |
109 | ctx.cfg.footer = xstrdup(value); | 109 | ctx.cfg.footer = xstrdup(value); |
110 | else if (!strcmp(name, "head-include")) | 110 | else if (!strcmp(name, "head-include")) |
111 | ctx.cfg.head_include = xstrdup(value); | 111 | ctx.cfg.head_include = xstrdup(value); |
112 | else if (!strcmp(name, "header")) | 112 | else if (!strcmp(name, "header")) |
113 | ctx.cfg.header = xstrdup(value); | 113 | ctx.cfg.header = xstrdup(value); |
114 | else if (!strcmp(name, "logo")) | 114 | else if (!strcmp(name, "logo")) |
115 | ctx.cfg.logo = xstrdup(value); | 115 | ctx.cfg.logo = xstrdup(value); |
116 | else if (!strcmp(name, "index-header")) | 116 | else if (!strcmp(name, "index-header")) |
117 | ctx.cfg.index_header = xstrdup(value); | 117 | ctx.cfg.index_header = xstrdup(value); |
118 | else if (!strcmp(name, "index-info")) | 118 | else if (!strcmp(name, "index-info")) |
119 | ctx.cfg.index_info = xstrdup(value); | 119 | ctx.cfg.index_info = xstrdup(value); |
120 | else if (!strcmp(name, "logo-link")) | 120 | else if (!strcmp(name, "logo-link")) |
121 | ctx.cfg.logo_link = xstrdup(value); | 121 | ctx.cfg.logo_link = xstrdup(value); |
122 | else if (!strcmp(name, "module-link")) | 122 | else if (!strcmp(name, "module-link")) |
123 | ctx.cfg.module_link = xstrdup(value); | 123 | ctx.cfg.module_link = xstrdup(value); |
124 | else if (!strcmp(name, "virtual-root")) { | 124 | else if (!strcmp(name, "virtual-root")) { |
125 | ctx.cfg.virtual_root = trim_end(value, '/'); | 125 | ctx.cfg.virtual_root = trim_end(value, '/'); |
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
127 | ctx.cfg.virtual_root = ""; | 127 | ctx.cfg.virtual_root = ""; |
128 | } else if (!strcmp(name, "nocache")) | 128 | } else if (!strcmp(name, "nocache")) |
129 | ctx.cfg.nocache = atoi(value); | 129 | ctx.cfg.nocache = atoi(value); |
130 | else if (!strcmp(name, "noplainemail")) | 130 | else if (!strcmp(name, "noplainemail")) |
131 | ctx.cfg.noplainemail = atoi(value); | 131 | ctx.cfg.noplainemail = atoi(value); |
132 | else if (!strcmp(name, "noheader")) | 132 | else if (!strcmp(name, "noheader")) |
133 | ctx.cfg.noheader = atoi(value); | 133 | ctx.cfg.noheader = atoi(value); |
134 | else if (!strcmp(name, "snapshots")) | 134 | else if (!strcmp(name, "snapshots")) |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
136 | else if (!strcmp(name, "enable-filter-overrides")) | 136 | else if (!strcmp(name, "enable-filter-overrides")) |
137 | ctx.cfg.enable_filter_overrides = atoi(value); | 137 | ctx.cfg.enable_filter_overrides = atoi(value); |
138 | else if (!strcmp(name, "enable-index-links")) | 138 | else if (!strcmp(name, "enable-index-links")) |
139 | ctx.cfg.enable_index_links = atoi(value); | 139 | ctx.cfg.enable_index_links = atoi(value); |
140 | else if (!strcmp(name, "enable-log-filecount")) | 140 | else if (!strcmp(name, "enable-log-filecount")) |
141 | ctx.cfg.enable_log_filecount = atoi(value); | 141 | ctx.cfg.enable_log_filecount = atoi(value); |
142 | else if (!strcmp(name, "enable-log-linecount")) | 142 | else if (!strcmp(name, "enable-log-linecount")) |
143 | ctx.cfg.enable_log_linecount = atoi(value); | 143 | ctx.cfg.enable_log_linecount = atoi(value); |
144 | else if (!strcmp(name, "enable-remote-branches")) | 144 | else if (!strcmp(name, "enable-remote-branches")) |
145 | ctx.cfg.enable_remote_branches = atoi(value); | 145 | ctx.cfg.enable_remote_branches = atoi(value); |
146 | else if (!strcmp(name, "enable-subject-links")) | 146 | else if (!strcmp(name, "enable-subject-links")) |
147 | ctx.cfg.enable_subject_links = atoi(value); | 147 | ctx.cfg.enable_subject_links = atoi(value); |
148 | else if (!strcmp(name, "enable-tree-linenumbers")) | 148 | else if (!strcmp(name, "enable-tree-linenumbers")) |
149 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 149 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
150 | else if (!strcmp(name, "max-stats")) | 150 | else if (!strcmp(name, "max-stats")) |
151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 151 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
152 | else if (!strcmp(name, "cache-size")) | 152 | else if (!strcmp(name, "cache-size")) |
153 | ctx.cfg.cache_size = atoi(value); | 153 | ctx.cfg.cache_size = atoi(value); |
154 | else if (!strcmp(name, "cache-root")) | 154 | else if (!strcmp(name, "cache-root")) |
155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); | 155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
156 | else if (!strcmp(name, "cache-root-ttl")) | 156 | else if (!strcmp(name, "cache-root-ttl")) |
157 | ctx.cfg.cache_root_ttl = atoi(value); | 157 | ctx.cfg.cache_root_ttl = atoi(value); |
158 | else if (!strcmp(name, "cache-repo-ttl")) | 158 | else if (!strcmp(name, "cache-repo-ttl")) |
159 | ctx.cfg.cache_repo_ttl = atoi(value); | 159 | ctx.cfg.cache_repo_ttl = atoi(value); |
160 | else if (!strcmp(name, "cache-scanrc-ttl")) | 160 | else if (!strcmp(name, "cache-scanrc-ttl")) |
161 | ctx.cfg.cache_scanrc_ttl = atoi(value); | 161 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
162 | else if (!strcmp(name, "cache-static-ttl")) | 162 | else if (!strcmp(name, "cache-static-ttl")) |
163 | ctx.cfg.cache_static_ttl = atoi(value); | 163 | ctx.cfg.cache_static_ttl = atoi(value); |
164 | else if (!strcmp(name, "cache-dynamic-ttl")) | 164 | else if (!strcmp(name, "cache-dynamic-ttl")) |
165 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 165 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
166 | else if (!strcmp(name, "about-filter")) | 166 | else if (!strcmp(name, "about-filter")) |
167 | ctx.cfg.about_filter = new_filter(value, 0); | 167 | ctx.cfg.about_filter = new_filter(value, 0); |
168 | else if (!strcmp(name, "commit-filter")) | 168 | else if (!strcmp(name, "commit-filter")) |
169 | ctx.cfg.commit_filter = new_filter(value, 0); | 169 | ctx.cfg.commit_filter = new_filter(value, 0); |
170 | else if (!strcmp(name, "embedded")) | 170 | else if (!strcmp(name, "embedded")) |
171 | ctx.cfg.embedded = atoi(value); | 171 | ctx.cfg.embedded = atoi(value); |
172 | else if (!strcmp(name, "max-atom-items")) | 172 | else if (!strcmp(name, "max-atom-items")) |
173 | ctx.cfg.max_atom_items = atoi(value); | 173 | ctx.cfg.max_atom_items = atoi(value); |
174 | else if (!strcmp(name, "max-message-length")) | 174 | else if (!strcmp(name, "max-message-length")) |
175 | ctx.cfg.max_msg_len = atoi(value); | 175 | ctx.cfg.max_msg_len = atoi(value); |
176 | else if (!strcmp(name, "max-repodesc-length")) | 176 | else if (!strcmp(name, "max-repodesc-length")) |
177 | ctx.cfg.max_repodesc_len = atoi(value); | 177 | ctx.cfg.max_repodesc_len = atoi(value); |
178 | else if (!strcmp(name, "max-blob-size")) | 178 | else if (!strcmp(name, "max-blob-size")) |
179 | ctx.cfg.max_blob_size = atoi(value); | 179 | ctx.cfg.max_blob_size = atoi(value); |
180 | else if (!strcmp(name, "max-repo-count")) | 180 | else if (!strcmp(name, "max-repo-count")) |
181 | ctx.cfg.max_repo_count = atoi(value); | 181 | ctx.cfg.max_repo_count = atoi(value); |
182 | else if (!strcmp(name, "max-commit-count")) | 182 | else if (!strcmp(name, "max-commit-count")) |
183 | ctx.cfg.max_commit_count = atoi(value); | 183 | ctx.cfg.max_commit_count = atoi(value); |
184 | else if (!strcmp(name, "project-list")) | 184 | else if (!strcmp(name, "project-list")) |
185 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | 185 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
186 | else if (!strcmp(name, "scan-path")) | 186 | else if (!strcmp(name, "scan-path")) |
187 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 187 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
188 | process_cached_repolist(expand_macros(value)); | 188 | process_cached_repolist(expand_macros(value)); |
189 | else if (ctx.cfg.project_list) | 189 | else if (ctx.cfg.project_list) |
190 | scan_projects(expand_macros(value), | 190 | scan_projects(expand_macros(value), |
191 | ctx.cfg.project_list, repo_config); | 191 | ctx.cfg.project_list, repo_config); |
192 | else | 192 | else |
193 | scan_tree(expand_macros(value), repo_config); | 193 | scan_tree(expand_macros(value), repo_config); |
194 | else if (!strcmp(name, "source-filter")) | 194 | else if (!strcmp(name, "source-filter")) |
195 | ctx.cfg.source_filter = new_filter(value, 1); | 195 | ctx.cfg.source_filter = new_filter(value, 1); |
196 | else if (!strcmp(name, "summary-log")) | 196 | else if (!strcmp(name, "summary-log")) |
197 | ctx.cfg.summary_log = atoi(value); | 197 | ctx.cfg.summary_log = atoi(value); |
198 | else if (!strcmp(name, "summary-branches")) | 198 | else if (!strcmp(name, "summary-branches")) |
199 | ctx.cfg.summary_branches = atoi(value); | 199 | ctx.cfg.summary_branches = atoi(value); |
200 | else if (!strcmp(name, "summary-tags")) | 200 | else if (!strcmp(name, "summary-tags")) |
201 | ctx.cfg.summary_tags = atoi(value); | 201 | ctx.cfg.summary_tags = atoi(value); |
202 | else if (!strcmp(name, "side-by-side-diffs")) | 202 | else if (!strcmp(name, "side-by-side-diffs")) |
203 | ctx.cfg.ssdiff = atoi(value); | 203 | ctx.cfg.ssdiff = atoi(value); |
204 | else if (!strcmp(name, "agefile")) | 204 | else if (!strcmp(name, "agefile")) |
205 | ctx.cfg.agefile = xstrdup(value); | 205 | ctx.cfg.agefile = xstrdup(value); |
206 | else if (!strcmp(name, "renamelimit")) | 206 | else if (!strcmp(name, "renamelimit")) |
207 | ctx.cfg.renamelimit = atoi(value); | 207 | ctx.cfg.renamelimit = atoi(value); |
208 | else if (!strcmp(name, "remove-suffix")) | ||
209 | ctx.cfg.remove_suffix = atoi(value); | ||
208 | else if (!strcmp(name, "robots")) | 210 | else if (!strcmp(name, "robots")) |
209 | ctx.cfg.robots = xstrdup(value); | 211 | ctx.cfg.robots = xstrdup(value); |
210 | else if (!strcmp(name, "clone-prefix")) | 212 | else if (!strcmp(name, "clone-prefix")) |
211 | ctx.cfg.clone_prefix = xstrdup(value); | 213 | ctx.cfg.clone_prefix = xstrdup(value); |
212 | else if (!strcmp(name, "local-time")) | 214 | else if (!strcmp(name, "local-time")) |
213 | ctx.cfg.local_time = atoi(value); | 215 | ctx.cfg.local_time = atoi(value); |
214 | else if (!prefixcmp(name, "mimetype.")) | 216 | else if (!prefixcmp(name, "mimetype.")) |
215 | add_mimetype(name + 9, value); | 217 | add_mimetype(name + 9, value); |
216 | else if (!strcmp(name, "include")) | 218 | else if (!strcmp(name, "include")) |
217 | parse_configfile(expand_macros(value), config_cb); | 219 | parse_configfile(expand_macros(value), config_cb); |
218 | } | 220 | } |
219 | 221 | ||
220 | static void querystring_cb(const char *name, const char *value) | 222 | static void querystring_cb(const char *name, const char *value) |
221 | { | 223 | { |
222 | if (!value) | 224 | if (!value) |
223 | value = ""; | 225 | value = ""; |
224 | 226 | ||
225 | if (!strcmp(name,"r")) { | 227 | if (!strcmp(name,"r")) { |
226 | ctx.qry.repo = xstrdup(value); | 228 | ctx.qry.repo = xstrdup(value); |
227 | ctx.repo = cgit_get_repoinfo(value); | 229 | ctx.repo = cgit_get_repoinfo(value); |
228 | } else if (!strcmp(name, "p")) { | 230 | } else if (!strcmp(name, "p")) { |
229 | ctx.qry.page = xstrdup(value); | 231 | ctx.qry.page = xstrdup(value); |
230 | } else if (!strcmp(name, "url")) { | 232 | } else if (!strcmp(name, "url")) { |
231 | if (*value == '/') | 233 | if (*value == '/') |
232 | value++; | 234 | value++; |
233 | ctx.qry.url = xstrdup(value); | 235 | ctx.qry.url = xstrdup(value); |
234 | cgit_parse_url(value); | 236 | cgit_parse_url(value); |
235 | } else if (!strcmp(name, "qt")) { | 237 | } else if (!strcmp(name, "qt")) { |
236 | ctx.qry.grep = xstrdup(value); | 238 | ctx.qry.grep = xstrdup(value); |
237 | } else if (!strcmp(name, "q")) { | 239 | } else if (!strcmp(name, "q")) { |
238 | ctx.qry.search = xstrdup(value); | 240 | ctx.qry.search = xstrdup(value); |
239 | } else if (!strcmp(name, "h")) { | 241 | } else if (!strcmp(name, "h")) { |
240 | ctx.qry.head = xstrdup(value); | 242 | ctx.qry.head = xstrdup(value); |
241 | ctx.qry.has_symref = 1; | 243 | ctx.qry.has_symref = 1; |
242 | } else if (!strcmp(name, "id")) { | 244 | } else if (!strcmp(name, "id")) { |
243 | ctx.qry.sha1 = xstrdup(value); | 245 | ctx.qry.sha1 = xstrdup(value); |
244 | ctx.qry.has_sha1 = 1; | 246 | ctx.qry.has_sha1 = 1; |
245 | } else if (!strcmp(name, "id2")) { | 247 | } else if (!strcmp(name, "id2")) { |
246 | ctx.qry.sha2 = xstrdup(value); | 248 | ctx.qry.sha2 = xstrdup(value); |
247 | ctx.qry.has_sha1 = 1; | 249 | ctx.qry.has_sha1 = 1; |
248 | } else if (!strcmp(name, "ofs")) { | 250 | } else if (!strcmp(name, "ofs")) { |
249 | ctx.qry.ofs = atoi(value); | 251 | ctx.qry.ofs = atoi(value); |
250 | } else if (!strcmp(name, "path")) { | 252 | } else if (!strcmp(name, "path")) { |
251 | ctx.qry.path = trim_end(value, '/'); | 253 | ctx.qry.path = trim_end(value, '/'); |
252 | } else if (!strcmp(name, "name")) { | 254 | } else if (!strcmp(name, "name")) { |
253 | ctx.qry.name = xstrdup(value); | 255 | ctx.qry.name = xstrdup(value); |
254 | } else if (!strcmp(name, "mimetype")) { | 256 | } else if (!strcmp(name, "mimetype")) { |
255 | ctx.qry.mimetype = xstrdup(value); | 257 | ctx.qry.mimetype = xstrdup(value); |
256 | } else if (!strcmp(name, "s")){ | 258 | } else if (!strcmp(name, "s")){ |
257 | ctx.qry.sort = xstrdup(value); | 259 | ctx.qry.sort = xstrdup(value); |
258 | } else if (!strcmp(name, "showmsg")) { | 260 | } else if (!strcmp(name, "showmsg")) { |
259 | ctx.qry.showmsg = atoi(value); | 261 | ctx.qry.showmsg = atoi(value); |
260 | } else if (!strcmp(name, "period")) { | 262 | } else if (!strcmp(name, "period")) { |
261 | ctx.qry.period = xstrdup(value); | 263 | ctx.qry.period = xstrdup(value); |
262 | } else if (!strcmp(name, "ss")) { | 264 | } else if (!strcmp(name, "ss")) { |
263 | ctx.qry.ssdiff = atoi(value); | 265 | ctx.qry.ssdiff = atoi(value); |
264 | } else if (!strcmp(name, "all")) { | 266 | } else if (!strcmp(name, "all")) { |
265 | ctx.qry.show_all = atoi(value); | 267 | ctx.qry.show_all = atoi(value); |
266 | } else if (!strcmp(name, "context")) { | 268 | } else if (!strcmp(name, "context")) { |
267 | ctx.qry.context = atoi(value); | 269 | ctx.qry.context = atoi(value); |
268 | } else if (!strcmp(name, "ignorews")) { | 270 | } else if (!strcmp(name, "ignorews")) { |
269 | ctx.qry.ignorews = atoi(value); | 271 | ctx.qry.ignorews = atoi(value); |
270 | } | 272 | } |
271 | } | 273 | } |
272 | 274 | ||
273 | char *xstrdupn(const char *str) | 275 | char *xstrdupn(const char *str) |
274 | { | 276 | { |
275 | return (str ? xstrdup(str) : NULL); | 277 | return (str ? xstrdup(str) : NULL); |
276 | } | 278 | } |
277 | 279 | ||
278 | static void prepare_context(struct cgit_context *ctx) | 280 | static void prepare_context(struct cgit_context *ctx) |
279 | { | 281 | { |
280 | memset(ctx, 0, sizeof(*ctx)); | 282 | memset(ctx, 0, sizeof(*ctx)); |
281 | ctx->cfg.agefile = "info/web/last-modified"; | 283 | ctx->cfg.agefile = "info/web/last-modified"; |
282 | ctx->cfg.nocache = 0; | 284 | ctx->cfg.nocache = 0; |
283 | ctx->cfg.cache_size = 0; | 285 | ctx->cfg.cache_size = 0; |
284 | ctx->cfg.cache_dynamic_ttl = 5; | 286 | ctx->cfg.cache_dynamic_ttl = 5; |
285 | ctx->cfg.cache_max_create_time = 5; | 287 | ctx->cfg.cache_max_create_time = 5; |
286 | ctx->cfg.cache_repo_ttl = 5; | 288 | ctx->cfg.cache_repo_ttl = 5; |
287 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 289 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
288 | ctx->cfg.cache_root_ttl = 5; | 290 | ctx->cfg.cache_root_ttl = 5; |
289 | ctx->cfg.cache_scanrc_ttl = 15; | 291 | ctx->cfg.cache_scanrc_ttl = 15; |
290 | ctx->cfg.cache_static_ttl = -1; | 292 | ctx->cfg.cache_static_ttl = -1; |
291 | ctx->cfg.css = "/cgit.css"; | 293 | ctx->cfg.css = "/cgit.css"; |
292 | ctx->cfg.logo = "/cgit.png"; | 294 | ctx->cfg.logo = "/cgit.png"; |
293 | ctx->cfg.local_time = 0; | 295 | ctx->cfg.local_time = 0; |
294 | ctx->cfg.enable_tree_linenumbers = 1; | 296 | ctx->cfg.enable_tree_linenumbers = 1; |
295 | ctx->cfg.max_repo_count = 50; | 297 | ctx->cfg.max_repo_count = 50; |
296 | ctx->cfg.max_commit_count = 50; | 298 | ctx->cfg.max_commit_count = 50; |
297 | ctx->cfg.max_lock_attempts = 5; | 299 | ctx->cfg.max_lock_attempts = 5; |
298 | ctx->cfg.max_msg_len = 80; | 300 | ctx->cfg.max_msg_len = 80; |
299 | ctx->cfg.max_repodesc_len = 80; | 301 | ctx->cfg.max_repodesc_len = 80; |
300 | ctx->cfg.max_blob_size = 0; | 302 | ctx->cfg.max_blob_size = 0; |
301 | ctx->cfg.max_stats = 0; | 303 | ctx->cfg.max_stats = 0; |
302 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 304 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
303 | ctx->cfg.project_list = NULL; | 305 | ctx->cfg.project_list = NULL; |
304 | ctx->cfg.renamelimit = -1; | 306 | ctx->cfg.renamelimit = -1; |
307 | ctx->cfg.remove_suffix = 0; | ||
305 | ctx->cfg.robots = "index, nofollow"; | 308 | ctx->cfg.robots = "index, nofollow"; |
306 | ctx->cfg.root_title = "Git repository browser"; | 309 | ctx->cfg.root_title = "Git repository browser"; |
307 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 310 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
308 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 311 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
309 | ctx->cfg.section = ""; | 312 | ctx->cfg.section = ""; |
310 | ctx->cfg.summary_branches = 10; | 313 | ctx->cfg.summary_branches = 10; |
311 | ctx->cfg.summary_log = 10; | 314 | ctx->cfg.summary_log = 10; |
312 | ctx->cfg.summary_tags = 10; | 315 | ctx->cfg.summary_tags = 10; |
313 | ctx->cfg.max_atom_items = 10; | 316 | ctx->cfg.max_atom_items = 10; |
314 | ctx->cfg.ssdiff = 0; | 317 | ctx->cfg.ssdiff = 0; |
315 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 318 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
316 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 319 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
317 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 320 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
318 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 321 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
319 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 322 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
320 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 323 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
321 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 324 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
322 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 325 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
323 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 326 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
324 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 327 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
325 | ctx->page.mimetype = "text/html"; | 328 | ctx->page.mimetype = "text/html"; |
326 | ctx->page.charset = PAGE_ENCODING; | 329 | ctx->page.charset = PAGE_ENCODING; |
327 | ctx->page.filename = NULL; | 330 | ctx->page.filename = NULL; |
328 | ctx->page.size = 0; | 331 | ctx->page.size = 0; |
329 | ctx->page.modified = time(NULL); | 332 | ctx->page.modified = time(NULL); |
330 | ctx->page.expires = ctx->page.modified; | 333 | ctx->page.expires = ctx->page.modified; |
331 | ctx->page.etag = NULL; | 334 | ctx->page.etag = NULL; |
332 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 335 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
333 | if (ctx->env.script_name) | 336 | if (ctx->env.script_name) |
334 | ctx->cfg.script_name = ctx->env.script_name; | 337 | ctx->cfg.script_name = ctx->env.script_name; |
335 | if (ctx->env.query_string) | 338 | if (ctx->env.query_string) |
336 | ctx->qry.raw = ctx->env.query_string; | 339 | ctx->qry.raw = ctx->env.query_string; |
337 | if (!ctx->env.cgit_config) | 340 | if (!ctx->env.cgit_config) |
338 | ctx->env.cgit_config = CGIT_CONFIG; | 341 | ctx->env.cgit_config = CGIT_CONFIG; |
339 | } | 342 | } |
340 | 343 | ||
341 | struct refmatch { | 344 | struct refmatch { |
342 | char *req_ref; | 345 | char *req_ref; |
343 | char *first_ref; | 346 | char *first_ref; |
344 | int match; | 347 | int match; |
345 | }; | 348 | }; |
346 | 349 | ||
347 | int find_current_ref(const char *refname, const unsigned char *sha1, | 350 | int find_current_ref(const char *refname, const unsigned char *sha1, |
348 | int flags, void *cb_data) | 351 | int flags, void *cb_data) |
349 | { | 352 | { |
350 | struct refmatch *info; | 353 | struct refmatch *info; |
351 | 354 | ||
352 | info = (struct refmatch *)cb_data; | 355 | info = (struct refmatch *)cb_data; |
353 | if (!strcmp(refname, info->req_ref)) | 356 | if (!strcmp(refname, info->req_ref)) |
354 | info->match = 1; | 357 | info->match = 1; |
355 | if (!info->first_ref) | 358 | if (!info->first_ref) |
356 | info->first_ref = xstrdup(refname); | 359 | info->first_ref = xstrdup(refname); |
357 | return info->match; | 360 | return info->match; |
358 | } | 361 | } |
359 | 362 | ||
360 | char *find_default_branch(struct cgit_repo *repo) | 363 | char *find_default_branch(struct cgit_repo *repo) |
361 | { | 364 | { |
362 | struct refmatch info; | 365 | struct refmatch info; |
363 | char *ref; | 366 | char *ref; |
364 | 367 | ||
365 | info.req_ref = repo->defbranch; | 368 | info.req_ref = repo->defbranch; |
366 | info.first_ref = NULL; | 369 | info.first_ref = NULL; |
367 | info.match = 0; | 370 | info.match = 0; |
368 | for_each_branch_ref(find_current_ref, &info); | 371 | for_each_branch_ref(find_current_ref, &info); |
369 | if (info.match) | 372 | if (info.match) |
370 | ref = info.req_ref; | 373 | ref = info.req_ref; |
371 | else | 374 | else |
372 | ref = info.first_ref; | 375 | ref = info.first_ref; |
373 | if (ref) | 376 | if (ref) |
374 | ref = xstrdup(ref); | 377 | ref = xstrdup(ref); |
375 | return ref; | 378 | return ref; |
376 | } | 379 | } |
377 | 380 | ||
378 | static int prepare_repo_cmd(struct cgit_context *ctx) | 381 | static int prepare_repo_cmd(struct cgit_context *ctx) |
379 | { | 382 | { |
380 | char *tmp; | 383 | char *tmp; |
381 | unsigned char sha1[20]; | 384 | unsigned char sha1[20]; |
382 | int nongit = 0; | 385 | int nongit = 0; |
383 | 386 | ||
384 | setenv("GIT_DIR", ctx->repo->path, 1); | 387 | setenv("GIT_DIR", ctx->repo->path, 1); |
385 | setup_git_directory_gently(&nongit); | 388 | setup_git_directory_gently(&nongit); |
386 | if (nongit) { | 389 | if (nongit) { |
387 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 390 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
388 | "config error"); | 391 | "config error"); |
389 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 392 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
390 | ctx->repo = NULL; | 393 | ctx->repo = NULL; |
391 | cgit_print_http_headers(ctx); | 394 | cgit_print_http_headers(ctx); |
392 | cgit_print_docstart(ctx); | 395 | cgit_print_docstart(ctx); |
393 | cgit_print_pageheader(ctx); | 396 | cgit_print_pageheader(ctx); |
394 | cgit_print_error(tmp); | 397 | cgit_print_error(tmp); |
395 | cgit_print_docend(); | 398 | cgit_print_docend(); |
396 | return 1; | 399 | return 1; |
397 | } | 400 | } |
398 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 401 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
399 | 402 | ||
400 | if (!ctx->qry.head) { | 403 | if (!ctx->qry.head) { |
401 | ctx->qry.nohead = 1; | 404 | ctx->qry.nohead = 1; |
402 | ctx->qry.head = find_default_branch(ctx->repo); | 405 | ctx->qry.head = find_default_branch(ctx->repo); |
403 | ctx->repo->defbranch = ctx->qry.head; | 406 | ctx->repo->defbranch = ctx->qry.head; |
404 | } | 407 | } |
405 | 408 | ||
406 | if (!ctx->qry.head) { | 409 | if (!ctx->qry.head) { |
407 | cgit_print_http_headers(ctx); | 410 | cgit_print_http_headers(ctx); |
408 | cgit_print_docstart(ctx); | 411 | cgit_print_docstart(ctx); |
409 | cgit_print_pageheader(ctx); | 412 | cgit_print_pageheader(ctx); |
410 | cgit_print_error("Repository seems to be empty"); | 413 | cgit_print_error("Repository seems to be empty"); |
411 | cgit_print_docend(); | 414 | cgit_print_docend(); |
412 | return 1; | 415 | return 1; |
413 | } | 416 | } |
414 | 417 | ||
415 | if (get_sha1(ctx->qry.head, sha1)) { | 418 | if (get_sha1(ctx->qry.head, sha1)) { |
416 | tmp = xstrdup(ctx->qry.head); | 419 | tmp = xstrdup(ctx->qry.head); |
417 | ctx->qry.head = ctx->repo->defbranch; | 420 | ctx->qry.head = ctx->repo->defbranch; |
418 | ctx->page.status = 404; | 421 | ctx->page.status = 404; |
419 | ctx->page.statusmsg = "not found"; | 422 | ctx->page.statusmsg = "not found"; |
420 | cgit_print_http_headers(ctx); | 423 | cgit_print_http_headers(ctx); |
421 | cgit_print_docstart(ctx); | 424 | cgit_print_docstart(ctx); |
422 | cgit_print_pageheader(ctx); | 425 | cgit_print_pageheader(ctx); |
423 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 426 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
424 | cgit_print_docend(); | 427 | cgit_print_docend(); |
425 | return 1; | 428 | return 1; |
426 | } | 429 | } |
427 | return 0; | 430 | return 0; |
428 | } | 431 | } |
429 | 432 | ||
430 | static void process_request(void *cbdata) | 433 | static void process_request(void *cbdata) |
431 | { | 434 | { |
432 | struct cgit_context *ctx = cbdata; | 435 | struct cgit_context *ctx = cbdata; |
433 | struct cgit_cmd *cmd; | 436 | struct cgit_cmd *cmd; |
434 | 437 | ||
435 | cmd = cgit_get_cmd(ctx); | 438 | cmd = cgit_get_cmd(ctx); |
436 | if (!cmd) { | 439 | if (!cmd) { |
437 | ctx->page.title = "cgit error"; | 440 | ctx->page.title = "cgit error"; |
438 | cgit_print_http_headers(ctx); | 441 | cgit_print_http_headers(ctx); |
439 | cgit_print_docstart(ctx); | 442 | cgit_print_docstart(ctx); |
440 | cgit_print_pageheader(ctx); | 443 | cgit_print_pageheader(ctx); |
441 | cgit_print_error("Invalid request"); | 444 | cgit_print_error("Invalid request"); |
442 | cgit_print_docend(); | 445 | cgit_print_docend(); |
443 | return; | 446 | return; |
444 | } | 447 | } |
445 | 448 | ||
446 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" | 449 | /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual" |
447 | * in-project path limit to be made available at ctx->qry.vpath. | 450 | * in-project path limit to be made available at ctx->qry.vpath. |
448 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). | 451 | * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL). |
449 | */ | 452 | */ |
450 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; | 453 | ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL; |
451 | 454 | ||
452 | if (cmd->want_repo && !ctx->repo) { | 455 | if (cmd->want_repo && !ctx->repo) { |
453 | cgit_print_http_headers(ctx); | 456 | cgit_print_http_headers(ctx); |
454 | cgit_print_docstart(ctx); | 457 | cgit_print_docstart(ctx); |
455 | cgit_print_pageheader(ctx); | 458 | cgit_print_pageheader(ctx); |
456 | cgit_print_error(fmt("No repository selected")); | 459 | cgit_print_error(fmt("No repository selected")); |
457 | cgit_print_docend(); | 460 | cgit_print_docend(); |
458 | return; | 461 | return; |
459 | } | 462 | } |
460 | 463 | ||
461 | if (ctx->repo && prepare_repo_cmd(ctx)) | 464 | if (ctx->repo && prepare_repo_cmd(ctx)) |
462 | return; | 465 | return; |
463 | 466 | ||
464 | if (cmd->want_layout) { | 467 | if (cmd->want_layout) { |
465 | cgit_print_http_headers(ctx); | 468 | cgit_print_http_headers(ctx); |
466 | cgit_print_docstart(ctx); | 469 | cgit_print_docstart(ctx); |
467 | cgit_print_pageheader(ctx); | 470 | cgit_print_pageheader(ctx); |
468 | } | 471 | } |
469 | 472 | ||
470 | cmd->fn(ctx); | 473 | cmd->fn(ctx); |
471 | 474 | ||
472 | if (cmd->want_layout) | 475 | if (cmd->want_layout) |
473 | cgit_print_docend(); | 476 | cgit_print_docend(); |
474 | } | 477 | } |
475 | 478 | ||
476 | int cmp_repos(const void *a, const void *b) | 479 | int cmp_repos(const void *a, const void *b) |
477 | { | 480 | { |
478 | const struct cgit_repo *ra = a, *rb = b; | 481 | const struct cgit_repo *ra = a, *rb = b; |
479 | return strcmp(ra->url, rb->url); | 482 | return strcmp(ra->url, rb->url); |
480 | } | 483 | } |
481 | 484 | ||
482 | char *build_snapshot_setting(int bitmap) | 485 | char *build_snapshot_setting(int bitmap) |
483 | { | 486 | { |
484 | const struct cgit_snapshot_format *f; | 487 | const struct cgit_snapshot_format *f; |
485 | char *result = xstrdup(""); | 488 | char *result = xstrdup(""); |
486 | char *tmp; | 489 | char *tmp; |
487 | int len; | 490 | int len; |
488 | 491 | ||
489 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 492 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
490 | if (f->bit & bitmap) { | 493 | if (f->bit & bitmap) { |
491 | tmp = result; | 494 | tmp = result; |
492 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); | 495 | result = xstrdup(fmt("%s%s ", tmp, f->suffix)); |
493 | free(tmp); | 496 | free(tmp); |
494 | } | 497 | } |
495 | } | 498 | } |
496 | len = strlen(result); | 499 | len = strlen(result); |
497 | if (len) | 500 | if (len) |
498 | result[len - 1] = '\0'; | 501 | result[len - 1] = '\0'; |
499 | return result; | 502 | return result; |
500 | } | 503 | } |
501 | 504 | ||
502 | char *get_first_line(char *txt) | 505 | char *get_first_line(char *txt) |
503 | { | 506 | { |
504 | char *t = xstrdup(txt); | 507 | char *t = xstrdup(txt); |
505 | char *p = strchr(t, '\n'); | 508 | char *p = strchr(t, '\n'); |
506 | if (p) | 509 | if (p) |
507 | *p = '\0'; | 510 | *p = '\0'; |
508 | return t; | 511 | return t; |
509 | } | 512 | } |
510 | 513 | ||
511 | void print_repo(FILE *f, struct cgit_repo *repo) | 514 | void print_repo(FILE *f, struct cgit_repo *repo) |
512 | { | 515 | { |
513 | fprintf(f, "repo.url=%s\n", repo->url); | 516 | fprintf(f, "repo.url=%s\n", repo->url); |
514 | fprintf(f, "repo.name=%s\n", repo->name); | 517 | fprintf(f, "repo.name=%s\n", repo->name); |
515 | fprintf(f, "repo.path=%s\n", repo->path); | 518 | fprintf(f, "repo.path=%s\n", repo->path); |
516 | if (repo->owner) | 519 | if (repo->owner) |
517 | fprintf(f, "repo.owner=%s\n", repo->owner); | 520 | fprintf(f, "repo.owner=%s\n", repo->owner); |
518 | if (repo->desc) { | 521 | if (repo->desc) { |
519 | char *tmp = get_first_line(repo->desc); | 522 | char *tmp = get_first_line(repo->desc); |
520 | fprintf(f, "repo.desc=%s\n", tmp); | 523 | fprintf(f, "repo.desc=%s\n", tmp); |
521 | free(tmp); | 524 | free(tmp); |
522 | } | 525 | } |
523 | if (repo->readme) | 526 | if (repo->readme) |
524 | fprintf(f, "repo.readme=%s\n", repo->readme); | 527 | fprintf(f, "repo.readme=%s\n", repo->readme); |
525 | if (repo->defbranch) | 528 | if (repo->defbranch) |
526 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); | 529 | fprintf(f, "repo.defbranch=%s\n", repo->defbranch); |
527 | if (repo->module_link) | 530 | if (repo->module_link) |
528 | fprintf(f, "repo.module-link=%s\n", repo->module_link); | 531 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
529 | if (repo->section) | 532 | if (repo->section) |
530 | fprintf(f, "repo.section=%s\n", repo->section); | 533 | fprintf(f, "repo.section=%s\n", repo->section); |
531 | if (repo->clone_url) | 534 | if (repo->clone_url) |
532 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); | 535 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
533 | fprintf(f, "repo.enable-log-filecount=%d\n", | 536 | fprintf(f, "repo.enable-log-filecount=%d\n", |
534 | repo->enable_log_filecount); | 537 | repo->enable_log_filecount); |
535 | fprintf(f, "repo.enable-log-linecount=%d\n", | 538 | fprintf(f, "repo.enable-log-linecount=%d\n", |
536 | repo->enable_log_linecount); | 539 | repo->enable_log_linecount); |
537 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) | 540 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
538 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); | 541 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
539 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) | 542 | if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) |
540 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); | 543 | fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd); |
541 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) | 544 | if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) |
542 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); | 545 | fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd); |
543 | if (repo->snapshots != ctx.cfg.snapshots) { | 546 | if (repo->snapshots != ctx.cfg.snapshots) { |
544 | char *tmp = build_snapshot_setting(repo->snapshots); | 547 | char *tmp = build_snapshot_setting(repo->snapshots); |
545 | fprintf(f, "repo.snapshots=%s\n", tmp); | 548 | fprintf(f, "repo.snapshots=%s\n", tmp); |
546 | free(tmp); | 549 | free(tmp); |
547 | } | 550 | } |
548 | if (repo->max_stats != ctx.cfg.max_stats) | 551 | if (repo->max_stats != ctx.cfg.max_stats) |
549 | fprintf(f, "repo.max-stats=%s\n", | 552 | fprintf(f, "repo.max-stats=%s\n", |
550 | cgit_find_stats_periodname(repo->max_stats)); | 553 | cgit_find_stats_periodname(repo->max_stats)); |
551 | fprintf(f, "\n"); | 554 | fprintf(f, "\n"); |
552 | } | 555 | } |
553 | 556 | ||
554 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) | 557 | void print_repolist(FILE *f, struct cgit_repolist *list, int start) |
555 | { | 558 | { |
556 | int i; | 559 | int i; |
557 | 560 | ||
558 | for(i = start; i < list->count; i++) | 561 | for(i = start; i < list->count; i++) |
559 | print_repo(f, &list->repos[i]); | 562 | print_repo(f, &list->repos[i]); |
560 | } | 563 | } |
561 | 564 | ||
562 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' | 565 | /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc' |
563 | * and return 0 on success. | 566 | * and return 0 on success. |
564 | */ | 567 | */ |
565 | static int generate_cached_repolist(const char *path, const char *cached_rc) | 568 | static int generate_cached_repolist(const char *path, const char *cached_rc) |
566 | { | 569 | { |
567 | char *locked_rc; | 570 | char *locked_rc; |
568 | int idx; | 571 | int idx; |
569 | FILE *f; | 572 | FILE *f; |
570 | 573 | ||
571 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); | 574 | locked_rc = xstrdup(fmt("%s.lock", cached_rc)); |
572 | f = fopen(locked_rc, "wx"); | 575 | f = fopen(locked_rc, "wx"); |
573 | if (!f) { | 576 | if (!f) { |
574 | /* Inform about the error unless the lockfile already existed, | 577 | /* Inform about the error unless the lockfile already existed, |
575 | * since that only means we've got concurrent requests. | 578 | * since that only means we've got concurrent requests. |
576 | */ | 579 | */ |
577 | if (errno != EEXIST) | 580 | if (errno != EEXIST) |
578 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", | 581 | fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n", |
579 | locked_rc, strerror(errno), errno); | 582 | locked_rc, strerror(errno), errno); |
580 | return errno; | 583 | return errno; |
581 | } | 584 | } |
582 | idx = cgit_repolist.count; | 585 | idx = cgit_repolist.count; |
583 | if (ctx.cfg.project_list) | 586 | if (ctx.cfg.project_list) |
584 | scan_projects(path, ctx.cfg.project_list, repo_config); | 587 | scan_projects(path, ctx.cfg.project_list, repo_config); |
585 | else | 588 | else |
586 | scan_tree(path, repo_config); | 589 | scan_tree(path, repo_config); |
587 | print_repolist(f, &cgit_repolist, idx); | 590 | print_repolist(f, &cgit_repolist, idx); |
588 | if (rename(locked_rc, cached_rc)) | 591 | if (rename(locked_rc, cached_rc)) |
589 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", | 592 | fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", |
590 | locked_rc, cached_rc, strerror(errno), errno); | 593 | locked_rc, cached_rc, strerror(errno), errno); |
591 | fclose(f); | 594 | fclose(f); |
592 | return 0; | 595 | return 0; |
593 | } | 596 | } |
594 | 597 | ||
595 | static void process_cached_repolist(const char *path) | 598 | static void process_cached_repolist(const char *path) |
596 | { | 599 | { |
597 | struct stat st; | 600 | struct stat st; |
598 | char *cached_rc; | 601 | char *cached_rc; |
599 | time_t age; | 602 | time_t age; |
600 | unsigned long hash; | 603 | unsigned long hash; |
601 | 604 | ||
602 | hash = hash_str(path); | 605 | hash = hash_str(path); |
603 | if (ctx.cfg.project_list) | 606 | if (ctx.cfg.project_list) |
604 | hash += hash_str(ctx.cfg.project_list); | 607 | hash += hash_str(ctx.cfg.project_list); |
605 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, hash)); | 608 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, hash)); |
606 | 609 | ||
607 | if (stat(cached_rc, &st)) { | 610 | if (stat(cached_rc, &st)) { |
608 | /* Nothing is cached, we need to scan without forking. And | 611 | /* Nothing is cached, we need to scan without forking. And |
609 | * if we fail to generate a cached repolist, we need to | 612 | * if we fail to generate a cached repolist, we need to |
610 | * invoke scan_tree manually. | 613 | * invoke scan_tree manually. |
611 | */ | 614 | */ |
612 | if (generate_cached_repolist(path, cached_rc)) { | 615 | if (generate_cached_repolist(path, cached_rc)) { |
613 | if (ctx.cfg.project_list) | 616 | if (ctx.cfg.project_list) |
614 | scan_projects(path, ctx.cfg.project_list, | 617 | scan_projects(path, ctx.cfg.project_list, |
615 | repo_config); | 618 | repo_config); |
616 | else | 619 | else |
617 | scan_tree(path, repo_config); | 620 | scan_tree(path, repo_config); |
618 | } | 621 | } |
619 | return; | 622 | return; |
620 | } | 623 | } |
621 | 624 | ||
622 | parse_configfile(cached_rc, config_cb); | 625 | parse_configfile(cached_rc, config_cb); |
623 | 626 | ||
624 | /* If the cached configfile hasn't expired, lets exit now */ | 627 | /* If the cached configfile hasn't expired, lets exit now */ |
625 | age = time(NULL) - st.st_mtime; | 628 | age = time(NULL) - st.st_mtime; |
626 | if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) | 629 | if (age <= (ctx.cfg.cache_scanrc_ttl * 60)) |
627 | return; | 630 | return; |
628 | 631 | ||
629 | /* The cached repolist has been parsed, but it was old. So lets | 632 | /* The cached repolist has been parsed, but it was old. So lets |
630 | * rescan the specified path and generate a new cached repolist | 633 | * rescan the specified path and generate a new cached repolist |
631 | * in a child-process to avoid latency for the current request. | 634 | * in a child-process to avoid latency for the current request. |
632 | */ | 635 | */ |
633 | if (fork()) | 636 | if (fork()) |
634 | return; | 637 | return; |
635 | 638 | ||
636 | exit(generate_cached_repolist(path, cached_rc)); | 639 | exit(generate_cached_repolist(path, cached_rc)); |
637 | } | 640 | } |
638 | 641 | ||
639 | static void cgit_parse_args(int argc, const char **argv) | 642 | static void cgit_parse_args(int argc, const char **argv) |
640 | { | 643 | { |
641 | int i; | 644 | int i; |
642 | int scan = 0; | 645 | int scan = 0; |
643 | 646 | ||
644 | for (i = 1; i < argc; i++) { | 647 | for (i = 1; i < argc; i++) { |
645 | if (!strncmp(argv[i], "--cache=", 8)) { | 648 | if (!strncmp(argv[i], "--cache=", 8)) { |
646 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 649 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
647 | } | 650 | } |
648 | if (!strcmp(argv[i], "--nocache")) { | 651 | if (!strcmp(argv[i], "--nocache")) { |
649 | ctx.cfg.nocache = 1; | 652 | ctx.cfg.nocache = 1; |
650 | } | 653 | } |
651 | if (!strcmp(argv[i], "--nohttp")) { | 654 | if (!strcmp(argv[i], "--nohttp")) { |
652 | ctx.env.no_http = "1"; | 655 | ctx.env.no_http = "1"; |
653 | } | 656 | } |
654 | if (!strncmp(argv[i], "--query=", 8)) { | 657 | if (!strncmp(argv[i], "--query=", 8)) { |
655 | ctx.qry.raw = xstrdup(argv[i]+8); | 658 | ctx.qry.raw = xstrdup(argv[i]+8); |
656 | } | 659 | } |
657 | if (!strncmp(argv[i], "--repo=", 7)) { | 660 | if (!strncmp(argv[i], "--repo=", 7)) { |
658 | ctx.qry.repo = xstrdup(argv[i]+7); | 661 | ctx.qry.repo = xstrdup(argv[i]+7); |
659 | } | 662 | } |
660 | if (!strncmp(argv[i], "--page=", 7)) { | 663 | if (!strncmp(argv[i], "--page=", 7)) { |
661 | ctx.qry.page = xstrdup(argv[i]+7); | 664 | ctx.qry.page = xstrdup(argv[i]+7); |
662 | } | 665 | } |
663 | if (!strncmp(argv[i], "--head=", 7)) { | 666 | if (!strncmp(argv[i], "--head=", 7)) { |
664 | ctx.qry.head = xstrdup(argv[i]+7); | 667 | ctx.qry.head = xstrdup(argv[i]+7); |
665 | ctx.qry.has_symref = 1; | 668 | ctx.qry.has_symref = 1; |
666 | } | 669 | } |
667 | if (!strncmp(argv[i], "--sha1=", 7)) { | 670 | if (!strncmp(argv[i], "--sha1=", 7)) { |
668 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 671 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
669 | ctx.qry.has_sha1 = 1; | 672 | ctx.qry.has_sha1 = 1; |
670 | } | 673 | } |
671 | if (!strncmp(argv[i], "--ofs=", 6)) { | 674 | if (!strncmp(argv[i], "--ofs=", 6)) { |
672 | ctx.qry.ofs = atoi(argv[i]+6); | 675 | ctx.qry.ofs = atoi(argv[i]+6); |
673 | } | 676 | } |
674 | if (!strncmp(argv[i], "--scan-tree=", 12) || | 677 | if (!strncmp(argv[i], "--scan-tree=", 12) || |
675 | !strncmp(argv[i], "--scan-path=", 12)) { | 678 | !strncmp(argv[i], "--scan-path=", 12)) { |
676 | /* HACK: the global snapshot bitmask defines the | 679 | /* HACK: the global snapshot bitmask defines the |
677 | * set of allowed snapshot formats, but the config | 680 | * set of allowed snapshot formats, but the config |
678 | * file hasn't been parsed yet so the mask is | 681 | * file hasn't been parsed yet so the mask is |
679 | * currently 0. By setting all bits high before | 682 | * currently 0. By setting all bits high before |
680 | * scanning we make sure that any in-repo cgitrc | 683 | * scanning we make sure that any in-repo cgitrc |
681 | * snapshot setting is respected by scan_tree(). | 684 | * snapshot setting is respected by scan_tree(). |
682 | * BTW: we assume that there'll never be more than | 685 | * BTW: we assume that there'll never be more than |
683 | * 255 different snapshot formats supported by cgit... | 686 | * 255 different snapshot formats supported by cgit... |
684 | */ | 687 | */ |
685 | ctx.cfg.snapshots = 0xFF; | 688 | ctx.cfg.snapshots = 0xFF; |
686 | scan++; | 689 | scan++; |
687 | scan_tree(argv[i] + 12, repo_config); | 690 | scan_tree(argv[i] + 12, repo_config); |
688 | } | 691 | } |
689 | } | 692 | } |
690 | if (scan) { | 693 | if (scan) { |
691 | qsort(cgit_repolist.repos, cgit_repolist.count, | 694 | qsort(cgit_repolist.repos, cgit_repolist.count, |
692 | sizeof(struct cgit_repo), cmp_repos); | 695 | sizeof(struct cgit_repo), cmp_repos); |
693 | print_repolist(stdout, &cgit_repolist, 0); | 696 | print_repolist(stdout, &cgit_repolist, 0); |
694 | exit(0); | 697 | exit(0); |
695 | } | 698 | } |
696 | } | 699 | } |
697 | 700 | ||
698 | static int calc_ttl() | 701 | static int calc_ttl() |
699 | { | 702 | { |
700 | if (!ctx.repo) | 703 | if (!ctx.repo) |
701 | return ctx.cfg.cache_root_ttl; | 704 | return ctx.cfg.cache_root_ttl; |
702 | 705 | ||
703 | if (!ctx.qry.page) | 706 | if (!ctx.qry.page) |
704 | return ctx.cfg.cache_repo_ttl; | 707 | return ctx.cfg.cache_repo_ttl; |
705 | 708 | ||
706 | if (ctx.qry.has_symref) | 709 | if (ctx.qry.has_symref) |
707 | return ctx.cfg.cache_dynamic_ttl; | 710 | return ctx.cfg.cache_dynamic_ttl; |
708 | 711 | ||
709 | if (ctx.qry.has_sha1) | 712 | if (ctx.qry.has_sha1) |
710 | return ctx.cfg.cache_static_ttl; | 713 | return ctx.cfg.cache_static_ttl; |
711 | 714 | ||
712 | return ctx.cfg.cache_repo_ttl; | 715 | return ctx.cfg.cache_repo_ttl; |
713 | } | 716 | } |
714 | 717 | ||
715 | int main(int argc, const char **argv) | 718 | int main(int argc, const char **argv) |
716 | { | 719 | { |
717 | const char *path; | 720 | const char *path; |
718 | char *qry; | 721 | char *qry; |
719 | int err, ttl; | 722 | int err, ttl; |
720 | 723 | ||
721 | prepare_context(&ctx); | 724 | prepare_context(&ctx); |
722 | cgit_repolist.length = 0; | 725 | cgit_repolist.length = 0; |
723 | cgit_repolist.count = 0; | 726 | cgit_repolist.count = 0; |
724 | cgit_repolist.repos = NULL; | 727 | cgit_repolist.repos = NULL; |
725 | 728 | ||
726 | cgit_parse_args(argc, argv); | 729 | cgit_parse_args(argc, argv); |
727 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); | 730 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
728 | ctx.repo = NULL; | 731 | ctx.repo = NULL; |
729 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 732 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
730 | 733 | ||
731 | /* If virtual-root isn't specified in cgitrc, lets pretend | 734 | /* If virtual-root isn't specified in cgitrc, lets pretend |
732 | * that virtual-root equals SCRIPT_NAME. | 735 | * that virtual-root equals SCRIPT_NAME. |
733 | */ | 736 | */ |
734 | if (!ctx.cfg.virtual_root) | 737 | if (!ctx.cfg.virtual_root) |
735 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 738 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
736 | 739 | ||
737 | /* If no url parameter is specified on the querystring, lets | 740 | /* If no url parameter is specified on the querystring, lets |
738 | * use PATH_INFO as url. This allows cgit to work with virtual | 741 | * use PATH_INFO as url. This allows cgit to work with virtual |
739 | * urls without the need for rewriterules in the webserver (as | 742 | * urls without the need for rewriterules in the webserver (as |
740 | * long as PATH_INFO is included in the cache lookup key). | 743 | * long as PATH_INFO is included in the cache lookup key). |
741 | */ | 744 | */ |
742 | path = ctx.env.path_info; | 745 | path = ctx.env.path_info; |
743 | if (!ctx.qry.url && path) { | 746 | if (!ctx.qry.url && path) { |
744 | if (path[0] == '/') | 747 | if (path[0] == '/') |
745 | path++; | 748 | path++; |
746 | ctx.qry.url = xstrdup(path); | 749 | ctx.qry.url = xstrdup(path); |
747 | if (ctx.qry.raw) { | 750 | if (ctx.qry.raw) { |
748 | qry = ctx.qry.raw; | 751 | qry = ctx.qry.raw; |
749 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 752 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
750 | free(qry); | 753 | free(qry); |
751 | } else | 754 | } else |
752 | ctx.qry.raw = xstrdup(ctx.qry.url); | 755 | ctx.qry.raw = xstrdup(ctx.qry.url); |
753 | cgit_parse_url(ctx.qry.url); | 756 | cgit_parse_url(ctx.qry.url); |
754 | } | 757 | } |
755 | 758 | ||
756 | ttl = calc_ttl(); | 759 | ttl = calc_ttl(); |
757 | ctx.page.expires += ttl*60; | 760 | ctx.page.expires += ttl*60; |
758 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) | 761 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
759 | ctx.cfg.nocache = 1; | 762 | ctx.cfg.nocache = 1; |
760 | if (ctx.cfg.nocache) | 763 | if (ctx.cfg.nocache) |
761 | ctx.cfg.cache_size = 0; | 764 | ctx.cfg.cache_size = 0; |
762 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, | 765 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
763 | ctx.qry.raw, ttl, process_request, &ctx); | 766 | ctx.qry.raw, ttl, process_request, &ctx); |
764 | if (err) | 767 | if (err) |
765 | cgit_print_error(fmt("Error processing page: %s (%d)", | 768 | cgit_print_error(fmt("Error processing page: %s (%d)", |
766 | strerror(err), err)); | 769 | strerror(err), err)); |
767 | return err; | 770 | return err; |
768 | } | 771 | } |