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