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