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