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