summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-11 08:12:53 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-11 08:12:53 (UTC)
commit2c742d1a925486a47f74710325b3076a7742a9f9 (patch) (unidiff)
treee16e8de4c65cb659a5b487ac3f8a7d7254fef395
parentfcc6056230e367e276dcb5a292d45e272cc6e7e6 (diff)
parent80550bbe028b551550395653d32a0ba50db540ef (diff)
downloadcgit-2c742d1a925486a47f74710325b3076a7742a9f9.zip
cgit-2c742d1a925486a47f74710325b3076a7742a9f9.tar.gz
cgit-2c742d1a925486a47f74710325b3076a7742a9f9.tar.bz2
Merge branch 'lh/embedded'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c37
-rw-r--r--cgit.h14
-rw-r--r--ui-shared.c51
3 files changed, 63 insertions, 39 deletions
diff --git a/cgit.c b/cgit.c
index bf46b5a..66dd140 100644
--- a/cgit.c
+++ b/cgit.c
@@ -90,449 +90,466 @@ void config_cb(const char *name, const char *value)
90 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 90 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
91 else if (!strcmp(name, "cache-size")) 91 else if (!strcmp(name, "cache-size"))
92 ctx.cfg.cache_size = atoi(value); 92 ctx.cfg.cache_size = atoi(value);
93 else if (!strcmp(name, "cache-root")) 93 else if (!strcmp(name, "cache-root"))
94 ctx.cfg.cache_root = xstrdup(value); 94 ctx.cfg.cache_root = xstrdup(value);
95 else if (!strcmp(name, "cache-root-ttl")) 95 else if (!strcmp(name, "cache-root-ttl"))
96 ctx.cfg.cache_root_ttl = atoi(value); 96 ctx.cfg.cache_root_ttl = atoi(value);
97 else if (!strcmp(name, "cache-repo-ttl")) 97 else if (!strcmp(name, "cache-repo-ttl"))
98 ctx.cfg.cache_repo_ttl = atoi(value); 98 ctx.cfg.cache_repo_ttl = atoi(value);
99 else if (!strcmp(name, "cache-static-ttl")) 99 else if (!strcmp(name, "cache-static-ttl"))
100 ctx.cfg.cache_static_ttl = atoi(value); 100 ctx.cfg.cache_static_ttl = atoi(value);
101 else if (!strcmp(name, "cache-dynamic-ttl")) 101 else if (!strcmp(name, "cache-dynamic-ttl"))
102 ctx.cfg.cache_dynamic_ttl = atoi(value); 102 ctx.cfg.cache_dynamic_ttl = atoi(value);
103 else if (!strcmp(name, "about-filter")) 103 else if (!strcmp(name, "about-filter"))
104 ctx.cfg.about_filter = new_filter(value, 0); 104 ctx.cfg.about_filter = new_filter(value, 0);
105 else if (!strcmp(name, "commit-filter")) 105 else if (!strcmp(name, "commit-filter"))
106 ctx.cfg.commit_filter = new_filter(value, 0); 106 ctx.cfg.commit_filter = new_filter(value, 0);
107 else if (!strcmp(name, "embedded")) 107 else if (!strcmp(name, "embedded"))
108 ctx.cfg.embedded = atoi(value); 108 ctx.cfg.embedded = atoi(value);
109 else if (!strcmp(name, "max-message-length")) 109 else if (!strcmp(name, "max-message-length"))
110 ctx.cfg.max_msg_len = atoi(value); 110 ctx.cfg.max_msg_len = atoi(value);
111 else if (!strcmp(name, "max-repodesc-length")) 111 else if (!strcmp(name, "max-repodesc-length"))
112 ctx.cfg.max_repodesc_len = atoi(value); 112 ctx.cfg.max_repodesc_len = atoi(value);
113 else if (!strcmp(name, "max-repo-count")) 113 else if (!strcmp(name, "max-repo-count"))
114 ctx.cfg.max_repo_count = atoi(value); 114 ctx.cfg.max_repo_count = atoi(value);
115 else if (!strcmp(name, "max-commit-count")) 115 else if (!strcmp(name, "max-commit-count"))
116 ctx.cfg.max_commit_count = atoi(value); 116 ctx.cfg.max_commit_count = atoi(value);
117 else if (!strcmp(name, "source-filter")) 117 else if (!strcmp(name, "source-filter"))
118 ctx.cfg.source_filter = new_filter(value, 1); 118 ctx.cfg.source_filter = new_filter(value, 1);
119 else if (!strcmp(name, "summary-log")) 119 else if (!strcmp(name, "summary-log"))
120 ctx.cfg.summary_log = atoi(value); 120 ctx.cfg.summary_log = atoi(value);
121 else if (!strcmp(name, "summary-branches")) 121 else if (!strcmp(name, "summary-branches"))
122 ctx.cfg.summary_branches = atoi(value); 122 ctx.cfg.summary_branches = atoi(value);
123 else if (!strcmp(name, "summary-tags")) 123 else if (!strcmp(name, "summary-tags"))
124 ctx.cfg.summary_tags = atoi(value); 124 ctx.cfg.summary_tags = atoi(value);
125 else if (!strcmp(name, "agefile")) 125 else if (!strcmp(name, "agefile"))
126 ctx.cfg.agefile = xstrdup(value); 126 ctx.cfg.agefile = xstrdup(value);
127 else if (!strcmp(name, "renamelimit")) 127 else if (!strcmp(name, "renamelimit"))
128 ctx.cfg.renamelimit = atoi(value); 128 ctx.cfg.renamelimit = atoi(value);
129 else if (!strcmp(name, "robots")) 129 else if (!strcmp(name, "robots"))
130 ctx.cfg.robots = xstrdup(value); 130 ctx.cfg.robots = xstrdup(value);
131 else if (!strcmp(name, "clone-prefix")) 131 else if (!strcmp(name, "clone-prefix"))
132 ctx.cfg.clone_prefix = xstrdup(value); 132 ctx.cfg.clone_prefix = xstrdup(value);
133 else if (!strcmp(name, "local-time")) 133 else if (!strcmp(name, "local-time"))
134 ctx.cfg.local_time = atoi(value); 134 ctx.cfg.local_time = atoi(value);
135 else if (!prefixcmp(name, "mimetype.")) 135 else if (!prefixcmp(name, "mimetype."))
136 add_mimetype(name + 9, value); 136 add_mimetype(name + 9, value);
137 else if (!strcmp(name, "repo.group")) 137 else if (!strcmp(name, "repo.group"))
138 ctx.cfg.repo_group = xstrdup(value); 138 ctx.cfg.repo_group = xstrdup(value);
139 else if (!strcmp(name, "repo.url")) 139 else if (!strcmp(name, "repo.url"))
140 ctx.repo = cgit_add_repo(value); 140 ctx.repo = cgit_add_repo(value);
141 else if (!strcmp(name, "repo.name")) 141 else if (!strcmp(name, "repo.name"))
142 ctx.repo->name = xstrdup(value); 142 ctx.repo->name = xstrdup(value);
143 else if (ctx.repo && !strcmp(name, "repo.path")) 143 else if (ctx.repo && !strcmp(name, "repo.path"))
144 ctx.repo->path = trim_end(value, '/'); 144 ctx.repo->path = trim_end(value, '/');
145 else if (ctx.repo && !strcmp(name, "repo.clone-url")) 145 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
146 ctx.repo->clone_url = xstrdup(value); 146 ctx.repo->clone_url = xstrdup(value);
147 else if (ctx.repo && !strcmp(name, "repo.desc")) 147 else if (ctx.repo && !strcmp(name, "repo.desc"))
148 ctx.repo->desc = xstrdup(value); 148 ctx.repo->desc = xstrdup(value);
149 else if (ctx.repo && !strcmp(name, "repo.owner")) 149 else if (ctx.repo && !strcmp(name, "repo.owner"))
150 ctx.repo->owner = xstrdup(value); 150 ctx.repo->owner = xstrdup(value);
151 else if (ctx.repo && !strcmp(name, "repo.defbranch")) 151 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
152 ctx.repo->defbranch = xstrdup(value); 152 ctx.repo->defbranch = xstrdup(value);
153 else if (ctx.repo && !strcmp(name, "repo.snapshots")) 153 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
154 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 154 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
155 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) 155 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
156 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 156 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
157 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 157 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
158 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 158 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
159 else if (ctx.repo && !strcmp(name, "repo.max-stats")) 159 else if (ctx.repo && !strcmp(name, "repo.max-stats"))
160 ctx.repo->max_stats = cgit_find_stats_period(value, NULL); 160 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
161 else if (ctx.repo && !strcmp(name, "repo.module-link")) 161 else if (ctx.repo && !strcmp(name, "repo.module-link"))
162 ctx.repo->module_link= xstrdup(value); 162 ctx.repo->module_link= xstrdup(value);
163 else if (ctx.repo && !strcmp(name, "repo.about-filter")) 163 else if (ctx.repo && !strcmp(name, "repo.about-filter"))
164 ctx.repo->about_filter = new_filter(value, 0); 164 ctx.repo->about_filter = new_filter(value, 0);
165 else if (ctx.repo && !strcmp(name, "repo.commit-filter")) 165 else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
166 ctx.repo->commit_filter = new_filter(value, 0); 166 ctx.repo->commit_filter = new_filter(value, 0);
167 else if (ctx.repo && !strcmp(name, "repo.source-filter")) 167 else if (ctx.repo && !strcmp(name, "repo.source-filter"))
168 ctx.repo->source_filter = new_filter(value, 1); 168 ctx.repo->source_filter = new_filter(value, 1);
169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
170 if (*value == '/') 170 if (*value == '/')
171 ctx.repo->readme = xstrdup(value); 171 ctx.repo->readme = xstrdup(value);
172 else 172 else
173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
174 } else if (!strcmp(name, "include")) 174 } else if (!strcmp(name, "include"))
175 parse_configfile(value, config_cb); 175 parse_configfile(value, config_cb);
176} 176}
177 177
178static void querystring_cb(const char *name, const char *value) 178static void querystring_cb(const char *name, const char *value)
179{ 179{
180 if (!strcmp(name,"r")) { 180 if (!strcmp(name,"r")) {
181 ctx.qry.repo = xstrdup(value); 181 ctx.qry.repo = xstrdup(value);
182 ctx.repo = cgit_get_repoinfo(value); 182 ctx.repo = cgit_get_repoinfo(value);
183 } else if (!strcmp(name, "p")) { 183 } else if (!strcmp(name, "p")) {
184 ctx.qry.page = xstrdup(value); 184 ctx.qry.page = xstrdup(value);
185 } else if (!strcmp(name, "url")) { 185 } else if (!strcmp(name, "url")) {
186 ctx.qry.url = xstrdup(value); 186 ctx.qry.url = xstrdup(value);
187 cgit_parse_url(value); 187 cgit_parse_url(value);
188 } else if (!strcmp(name, "qt")) { 188 } else if (!strcmp(name, "qt")) {
189 ctx.qry.grep = xstrdup(value); 189 ctx.qry.grep = xstrdup(value);
190 } else if (!strcmp(name, "q")) { 190 } else if (!strcmp(name, "q")) {
191 ctx.qry.search = xstrdup(value); 191 ctx.qry.search = xstrdup(value);
192 } else if (!strcmp(name, "h")) { 192 } else if (!strcmp(name, "h")) {
193 ctx.qry.head = xstrdup(value); 193 ctx.qry.head = xstrdup(value);
194 ctx.qry.has_symref = 1; 194 ctx.qry.has_symref = 1;
195 } else if (!strcmp(name, "id")) { 195 } else if (!strcmp(name, "id")) {
196 ctx.qry.sha1 = xstrdup(value); 196 ctx.qry.sha1 = xstrdup(value);
197 ctx.qry.has_sha1 = 1; 197 ctx.qry.has_sha1 = 1;
198 } else if (!strcmp(name, "id2")) { 198 } else if (!strcmp(name, "id2")) {
199 ctx.qry.sha2 = xstrdup(value); 199 ctx.qry.sha2 = xstrdup(value);
200 ctx.qry.has_sha1 = 1; 200 ctx.qry.has_sha1 = 1;
201 } else if (!strcmp(name, "ofs")) { 201 } else if (!strcmp(name, "ofs")) {
202 ctx.qry.ofs = atoi(value); 202 ctx.qry.ofs = atoi(value);
203 } else if (!strcmp(name, "path")) { 203 } else if (!strcmp(name, "path")) {
204 ctx.qry.path = trim_end(value, '/'); 204 ctx.qry.path = trim_end(value, '/');
205 } else if (!strcmp(name, "name")) { 205 } else if (!strcmp(name, "name")) {
206 ctx.qry.name = xstrdup(value); 206 ctx.qry.name = xstrdup(value);
207 } else if (!strcmp(name, "mimetype")) { 207 } else if (!strcmp(name, "mimetype")) {
208 ctx.qry.mimetype = xstrdup(value); 208 ctx.qry.mimetype = xstrdup(value);
209 } else if (!strcmp(name, "s")){ 209 } else if (!strcmp(name, "s")){
210 ctx.qry.sort = xstrdup(value); 210 ctx.qry.sort = xstrdup(value);
211 } else if (!strcmp(name, "showmsg")) { 211 } else if (!strcmp(name, "showmsg")) {
212 ctx.qry.showmsg = atoi(value); 212 ctx.qry.showmsg = atoi(value);
213 } else if (!strcmp(name, "period")) { 213 } else if (!strcmp(name, "period")) {
214 ctx.qry.period = xstrdup(value); 214 ctx.qry.period = xstrdup(value);
215 } 215 }
216} 216}
217 217
218char *xstrdupn(const char *str)
219{
220 return (str ? xstrdup(str) : NULL);
221}
222
218static void prepare_context(struct cgit_context *ctx) 223static void prepare_context(struct cgit_context *ctx)
219{ 224{
220 memset(ctx, 0, sizeof(ctx)); 225 memset(ctx, 0, sizeof(ctx));
221 ctx->cfg.agefile = "info/web/last-modified"; 226 ctx->cfg.agefile = "info/web/last-modified";
222 ctx->cfg.nocache = 0; 227 ctx->cfg.nocache = 0;
223 ctx->cfg.cache_size = 0; 228 ctx->cfg.cache_size = 0;
224 ctx->cfg.cache_dynamic_ttl = 5; 229 ctx->cfg.cache_dynamic_ttl = 5;
225 ctx->cfg.cache_max_create_time = 5; 230 ctx->cfg.cache_max_create_time = 5;
226 ctx->cfg.cache_repo_ttl = 5; 231 ctx->cfg.cache_repo_ttl = 5;
227 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 232 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
228 ctx->cfg.cache_root_ttl = 5; 233 ctx->cfg.cache_root_ttl = 5;
229 ctx->cfg.cache_static_ttl = -1; 234 ctx->cfg.cache_static_ttl = -1;
230 ctx->cfg.css = "/cgit.css"; 235 ctx->cfg.css = "/cgit.css";
231 ctx->cfg.logo = "/cgit.png"; 236 ctx->cfg.logo = "/cgit.png";
232 ctx->cfg.local_time = 0; 237 ctx->cfg.local_time = 0;
233 ctx->cfg.max_repo_count = 50; 238 ctx->cfg.max_repo_count = 50;
234 ctx->cfg.max_commit_count = 50; 239 ctx->cfg.max_commit_count = 50;
235 ctx->cfg.max_lock_attempts = 5; 240 ctx->cfg.max_lock_attempts = 5;
236 ctx->cfg.max_msg_len = 80; 241 ctx->cfg.max_msg_len = 80;
237 ctx->cfg.max_repodesc_len = 80; 242 ctx->cfg.max_repodesc_len = 80;
238 ctx->cfg.max_stats = 0; 243 ctx->cfg.max_stats = 0;
239 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 244 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
240 ctx->cfg.renamelimit = -1; 245 ctx->cfg.renamelimit = -1;
241 ctx->cfg.robots = "index, nofollow"; 246 ctx->cfg.robots = "index, nofollow";
242 ctx->cfg.root_title = "Git repository browser"; 247 ctx->cfg.root_title = "Git repository browser";
243 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 248 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
244 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 249 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
245 ctx->cfg.summary_branches = 10; 250 ctx->cfg.summary_branches = 10;
246 ctx->cfg.summary_log = 10; 251 ctx->cfg.summary_log = 10;
247 ctx->cfg.summary_tags = 10; 252 ctx->cfg.summary_tags = 10;
253 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
254 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
255 ctx->env.https = xstrdupn(getenv("HTTPS"));
256 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
257 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
258 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
259 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
260 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
261 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
262 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
248 ctx->page.mimetype = "text/html"; 263 ctx->page.mimetype = "text/html";
249 ctx->page.charset = PAGE_ENCODING; 264 ctx->page.charset = PAGE_ENCODING;
250 ctx->page.filename = NULL; 265 ctx->page.filename = NULL;
251 ctx->page.size = 0; 266 ctx->page.size = 0;
252 ctx->page.modified = time(NULL); 267 ctx->page.modified = time(NULL);
253 ctx->page.expires = ctx->page.modified; 268 ctx->page.expires = ctx->page.modified;
254 ctx->page.etag = NULL; 269 ctx->page.etag = NULL;
255 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 270 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
271 if (ctx->env.script_name)
272 ctx->cfg.script_name = ctx->env.script_name;
273 if (ctx->env.query_string)
274 ctx->qry.raw = ctx->env.query_string;
275 if (!ctx->env.cgit_config)
276 ctx->env.cgit_config = CGIT_CONFIG;
256} 277}
257 278
258struct refmatch { 279struct refmatch {
259 char *req_ref; 280 char *req_ref;
260 char *first_ref; 281 char *first_ref;
261 int match; 282 int match;
262}; 283};
263 284
264int find_current_ref(const char *refname, const unsigned char *sha1, 285int find_current_ref(const char *refname, const unsigned char *sha1,
265 int flags, void *cb_data) 286 int flags, void *cb_data)
266{ 287{
267 struct refmatch *info; 288 struct refmatch *info;
268 289
269 info = (struct refmatch *)cb_data; 290 info = (struct refmatch *)cb_data;
270 if (!strcmp(refname, info->req_ref)) 291 if (!strcmp(refname, info->req_ref))
271 info->match = 1; 292 info->match = 1;
272 if (!info->first_ref) 293 if (!info->first_ref)
273 info->first_ref = xstrdup(refname); 294 info->first_ref = xstrdup(refname);
274 return info->match; 295 return info->match;
275} 296}
276 297
277char *find_default_branch(struct cgit_repo *repo) 298char *find_default_branch(struct cgit_repo *repo)
278{ 299{
279 struct refmatch info; 300 struct refmatch info;
280 char *ref; 301 char *ref;
281 302
282 info.req_ref = repo->defbranch; 303 info.req_ref = repo->defbranch;
283 info.first_ref = NULL; 304 info.first_ref = NULL;
284 info.match = 0; 305 info.match = 0;
285 for_each_branch_ref(find_current_ref, &info); 306 for_each_branch_ref(find_current_ref, &info);
286 if (info.match) 307 if (info.match)
287 ref = info.req_ref; 308 ref = info.req_ref;
288 else 309 else
289 ref = info.first_ref; 310 ref = info.first_ref;
290 if (ref) 311 if (ref)
291 ref = xstrdup(ref); 312 ref = xstrdup(ref);
292 return ref; 313 return ref;
293} 314}
294 315
295static int prepare_repo_cmd(struct cgit_context *ctx) 316static int prepare_repo_cmd(struct cgit_context *ctx)
296{ 317{
297 char *tmp; 318 char *tmp;
298 unsigned char sha1[20]; 319 unsigned char sha1[20];
299 int nongit = 0; 320 int nongit = 0;
300 321
301 setenv("GIT_DIR", ctx->repo->path, 1); 322 setenv("GIT_DIR", ctx->repo->path, 1);
302 setup_git_directory_gently(&nongit); 323 setup_git_directory_gently(&nongit);
303 if (nongit) { 324 if (nongit) {
304 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, 325 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
305 "config error"); 326 "config error");
306 tmp = fmt("Not a git repository: '%s'", ctx->repo->path); 327 tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
307 ctx->repo = NULL; 328 ctx->repo = NULL;
308 cgit_print_http_headers(ctx); 329 cgit_print_http_headers(ctx);
309 cgit_print_docstart(ctx); 330 cgit_print_docstart(ctx);
310 cgit_print_pageheader(ctx); 331 cgit_print_pageheader(ctx);
311 cgit_print_error(tmp); 332 cgit_print_error(tmp);
312 cgit_print_docend(); 333 cgit_print_docend();
313 return 1; 334 return 1;
314 } 335 }
315 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); 336 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
316 337
317 if (!ctx->qry.head) { 338 if (!ctx->qry.head) {
318 ctx->qry.nohead = 1; 339 ctx->qry.nohead = 1;
319 ctx->qry.head = find_default_branch(ctx->repo); 340 ctx->qry.head = find_default_branch(ctx->repo);
320 ctx->repo->defbranch = ctx->qry.head; 341 ctx->repo->defbranch = ctx->qry.head;
321 } 342 }
322 343
323 if (!ctx->qry.head) { 344 if (!ctx->qry.head) {
324 cgit_print_http_headers(ctx); 345 cgit_print_http_headers(ctx);
325 cgit_print_docstart(ctx); 346 cgit_print_docstart(ctx);
326 cgit_print_pageheader(ctx); 347 cgit_print_pageheader(ctx);
327 cgit_print_error("Repository seems to be empty"); 348 cgit_print_error("Repository seems to be empty");
328 cgit_print_docend(); 349 cgit_print_docend();
329 return 1; 350 return 1;
330 } 351 }
331 352
332 if (get_sha1(ctx->qry.head, sha1)) { 353 if (get_sha1(ctx->qry.head, sha1)) {
333 tmp = xstrdup(ctx->qry.head); 354 tmp = xstrdup(ctx->qry.head);
334 ctx->qry.head = ctx->repo->defbranch; 355 ctx->qry.head = ctx->repo->defbranch;
335 ctx->page.status = 404; 356 ctx->page.status = 404;
336 ctx->page.statusmsg = "not found"; 357 ctx->page.statusmsg = "not found";
337 cgit_print_http_headers(ctx); 358 cgit_print_http_headers(ctx);
338 cgit_print_docstart(ctx); 359 cgit_print_docstart(ctx);
339 cgit_print_pageheader(ctx); 360 cgit_print_pageheader(ctx);
340 cgit_print_error(fmt("Invalid branch: %s", tmp)); 361 cgit_print_error(fmt("Invalid branch: %s", tmp));
341 cgit_print_docend(); 362 cgit_print_docend();
342 return 1; 363 return 1;
343 } 364 }
344 return 0; 365 return 0;
345} 366}
346 367
347static void process_request(void *cbdata) 368static void process_request(void *cbdata)
348{ 369{
349 struct cgit_context *ctx = cbdata; 370 struct cgit_context *ctx = cbdata;
350 struct cgit_cmd *cmd; 371 struct cgit_cmd *cmd;
351 372
352 cmd = cgit_get_cmd(ctx); 373 cmd = cgit_get_cmd(ctx);
353 if (!cmd) { 374 if (!cmd) {
354 ctx->page.title = "cgit error"; 375 ctx->page.title = "cgit error";
355 cgit_print_http_headers(ctx); 376 cgit_print_http_headers(ctx);
356 cgit_print_docstart(ctx); 377 cgit_print_docstart(ctx);
357 cgit_print_pageheader(ctx); 378 cgit_print_pageheader(ctx);
358 cgit_print_error("Invalid request"); 379 cgit_print_error("Invalid request");
359 cgit_print_docend(); 380 cgit_print_docend();
360 return; 381 return;
361 } 382 }
362 383
363 if (cmd->want_repo && !ctx->repo) { 384 if (cmd->want_repo && !ctx->repo) {
364 cgit_print_http_headers(ctx); 385 cgit_print_http_headers(ctx);
365 cgit_print_docstart(ctx); 386 cgit_print_docstart(ctx);
366 cgit_print_pageheader(ctx); 387 cgit_print_pageheader(ctx);
367 cgit_print_error(fmt("No repository selected")); 388 cgit_print_error(fmt("No repository selected"));
368 cgit_print_docend(); 389 cgit_print_docend();
369 return; 390 return;
370 } 391 }
371 392
372 if (ctx->repo && prepare_repo_cmd(ctx)) 393 if (ctx->repo && prepare_repo_cmd(ctx))
373 return; 394 return;
374 395
375 if (cmd->want_layout) { 396 if (cmd->want_layout) {
376 cgit_print_http_headers(ctx); 397 cgit_print_http_headers(ctx);
377 cgit_print_docstart(ctx); 398 cgit_print_docstart(ctx);
378 cgit_print_pageheader(ctx); 399 cgit_print_pageheader(ctx);
379 } 400 }
380 401
381 cmd->fn(ctx); 402 cmd->fn(ctx);
382 403
383 if (cmd->want_layout) 404 if (cmd->want_layout)
384 cgit_print_docend(); 405 cgit_print_docend();
385} 406}
386 407
387int cmp_repos(const void *a, const void *b) 408int cmp_repos(const void *a, const void *b)
388{ 409{
389 const struct cgit_repo *ra = a, *rb = b; 410 const struct cgit_repo *ra = a, *rb = b;
390 return strcmp(ra->url, rb->url); 411 return strcmp(ra->url, rb->url);
391} 412}
392 413
393void print_repo(struct cgit_repo *repo) 414void print_repo(struct cgit_repo *repo)
394{ 415{
395 printf("repo.url=%s\n", repo->url); 416 printf("repo.url=%s\n", repo->url);
396 printf("repo.name=%s\n", repo->name); 417 printf("repo.name=%s\n", repo->name);
397 printf("repo.path=%s\n", repo->path); 418 printf("repo.path=%s\n", repo->path);
398 if (repo->owner) 419 if (repo->owner)
399 printf("repo.owner=%s\n", repo->owner); 420 printf("repo.owner=%s\n", repo->owner);
400 if (repo->desc) 421 if (repo->desc)
401 printf("repo.desc=%s\n", repo->desc); 422 printf("repo.desc=%s\n", repo->desc);
402 if (repo->readme) 423 if (repo->readme)
403 printf("repo.readme=%s\n", repo->readme); 424 printf("repo.readme=%s\n", repo->readme);
404 printf("\n"); 425 printf("\n");
405} 426}
406 427
407void print_repolist(struct cgit_repolist *list) 428void print_repolist(struct cgit_repolist *list)
408{ 429{
409 int i; 430 int i;
410 431
411 for(i = 0; i < list->count; i++) 432 for(i = 0; i < list->count; i++)
412 print_repo(&list->repos[i]); 433 print_repo(&list->repos[i]);
413} 434}
414 435
415 436
416static void cgit_parse_args(int argc, const char **argv) 437static void cgit_parse_args(int argc, const char **argv)
417{ 438{
418 int i; 439 int i;
419 int scan = 0; 440 int scan = 0;
420 441
421 for (i = 1; i < argc; i++) { 442 for (i = 1; i < argc; i++) {
422 if (!strncmp(argv[i], "--cache=", 8)) { 443 if (!strncmp(argv[i], "--cache=", 8)) {
423 ctx.cfg.cache_root = xstrdup(argv[i]+8); 444 ctx.cfg.cache_root = xstrdup(argv[i]+8);
424 } 445 }
425 if (!strcmp(argv[i], "--nocache")) { 446 if (!strcmp(argv[i], "--nocache")) {
426 ctx.cfg.nocache = 1; 447 ctx.cfg.nocache = 1;
427 } 448 }
449 if (!strcmp(argv[i], "--nohttp")) {
450 ctx.env.no_http = "1";
451 }
428 if (!strncmp(argv[i], "--query=", 8)) { 452 if (!strncmp(argv[i], "--query=", 8)) {
429 ctx.qry.raw = xstrdup(argv[i]+8); 453 ctx.qry.raw = xstrdup(argv[i]+8);
430 } 454 }
431 if (!strncmp(argv[i], "--repo=", 7)) { 455 if (!strncmp(argv[i], "--repo=", 7)) {
432 ctx.qry.repo = xstrdup(argv[i]+7); 456 ctx.qry.repo = xstrdup(argv[i]+7);
433 } 457 }
434 if (!strncmp(argv[i], "--page=", 7)) { 458 if (!strncmp(argv[i], "--page=", 7)) {
435 ctx.qry.page = xstrdup(argv[i]+7); 459 ctx.qry.page = xstrdup(argv[i]+7);
436 } 460 }
437 if (!strncmp(argv[i], "--head=", 7)) { 461 if (!strncmp(argv[i], "--head=", 7)) {
438 ctx.qry.head = xstrdup(argv[i]+7); 462 ctx.qry.head = xstrdup(argv[i]+7);
439 ctx.qry.has_symref = 1; 463 ctx.qry.has_symref = 1;
440 } 464 }
441 if (!strncmp(argv[i], "--sha1=", 7)) { 465 if (!strncmp(argv[i], "--sha1=", 7)) {
442 ctx.qry.sha1 = xstrdup(argv[i]+7); 466 ctx.qry.sha1 = xstrdup(argv[i]+7);
443 ctx.qry.has_sha1 = 1; 467 ctx.qry.has_sha1 = 1;
444 } 468 }
445 if (!strncmp(argv[i], "--ofs=", 6)) { 469 if (!strncmp(argv[i], "--ofs=", 6)) {
446 ctx.qry.ofs = atoi(argv[i]+6); 470 ctx.qry.ofs = atoi(argv[i]+6);
447 } 471 }
448 if (!strncmp(argv[i], "--scan-tree=", 12)) { 472 if (!strncmp(argv[i], "--scan-tree=", 12)) {
449 scan++; 473 scan++;
450 scan_tree(argv[i] + 12); 474 scan_tree(argv[i] + 12);
451 } 475 }
452 } 476 }
453 if (scan) { 477 if (scan) {
454 qsort(cgit_repolist.repos, cgit_repolist.count, 478 qsort(cgit_repolist.repos, cgit_repolist.count,
455 sizeof(struct cgit_repo), cmp_repos); 479 sizeof(struct cgit_repo), cmp_repos);
456 print_repolist(&cgit_repolist); 480 print_repolist(&cgit_repolist);
457 exit(0); 481 exit(0);
458 } 482 }
459} 483}
460 484
461static int calc_ttl() 485static int calc_ttl()
462{ 486{
463 if (!ctx.repo) 487 if (!ctx.repo)
464 return ctx.cfg.cache_root_ttl; 488 return ctx.cfg.cache_root_ttl;
465 489
466 if (!ctx.qry.page) 490 if (!ctx.qry.page)
467 return ctx.cfg.cache_repo_ttl; 491 return ctx.cfg.cache_repo_ttl;
468 492
469 if (ctx.qry.has_symref) 493 if (ctx.qry.has_symref)
470 return ctx.cfg.cache_dynamic_ttl; 494 return ctx.cfg.cache_dynamic_ttl;
471 495
472 if (ctx.qry.has_sha1) 496 if (ctx.qry.has_sha1)
473 return ctx.cfg.cache_static_ttl; 497 return ctx.cfg.cache_static_ttl;
474 498
475 return ctx.cfg.cache_repo_ttl; 499 return ctx.cfg.cache_repo_ttl;
476} 500}
477 501
478int main(int argc, const char **argv) 502int main(int argc, const char **argv)
479{ 503{
480 const char *cgit_config_env = getenv("CGIT_CONFIG");
481 const char *method = getenv("REQUEST_METHOD");
482 const char *path; 504 const char *path;
483 char *qry; 505 char *qry;
484 int err, ttl; 506 int err, ttl;
485 507
486 prepare_context(&ctx); 508 prepare_context(&ctx);
487 cgit_repolist.length = 0; 509 cgit_repolist.length = 0;
488 cgit_repolist.count = 0; 510 cgit_repolist.count = 0;
489 cgit_repolist.repos = NULL; 511 cgit_repolist.repos = NULL;
490 512
491 if (getenv("SCRIPT_NAME"))
492 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
493 if (getenv("QUERY_STRING"))
494 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
495 cgit_parse_args(argc, argv); 513 cgit_parse_args(argc, argv);
496 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 514 parse_configfile(ctx.env.cgit_config, config_cb);
497 config_cb);
498 ctx.repo = NULL; 515 ctx.repo = NULL;
499 http_parse_querystring(ctx.qry.raw, querystring_cb); 516 http_parse_querystring(ctx.qry.raw, querystring_cb);
500 517
501 /* If virtual-root isn't specified in cgitrc, lets pretend 518 /* If virtual-root isn't specified in cgitrc, lets pretend
502 * that virtual-root equals SCRIPT_NAME. 519 * that virtual-root equals SCRIPT_NAME.
503 */ 520 */
504 if (!ctx.cfg.virtual_root) 521 if (!ctx.cfg.virtual_root)
505 ctx.cfg.virtual_root = ctx.cfg.script_name; 522 ctx.cfg.virtual_root = ctx.cfg.script_name;
506 523
507 /* If no url parameter is specified on the querystring, lets 524 /* If no url parameter is specified on the querystring, lets
508 * use PATH_INFO as url. This allows cgit to work with virtual 525 * use PATH_INFO as url. This allows cgit to work with virtual
509 * urls without the need for rewriterules in the webserver (as 526 * urls without the need for rewriterules in the webserver (as
510 * long as PATH_INFO is included in the cache lookup key). 527 * long as PATH_INFO is included in the cache lookup key).
511 */ 528 */
512 path = getenv("PATH_INFO"); 529 path = ctx.env.path_info;
513 if (!ctx.qry.url && path) { 530 if (!ctx.qry.url && path) {
514 if (path[0] == '/') 531 if (path[0] == '/')
515 path++; 532 path++;
516 ctx.qry.url = xstrdup(path); 533 ctx.qry.url = xstrdup(path);
517 if (ctx.qry.raw) { 534 if (ctx.qry.raw) {
518 qry = ctx.qry.raw; 535 qry = ctx.qry.raw;
519 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 536 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
520 free(qry); 537 free(qry);
521 } else 538 } else
522 ctx.qry.raw = ctx.qry.url; 539 ctx.qry.raw = ctx.qry.url;
523 cgit_parse_url(ctx.qry.url); 540 cgit_parse_url(ctx.qry.url);
524 } 541 }
525 542
526 ttl = calc_ttl(); 543 ttl = calc_ttl();
527 ctx.page.expires += ttl*60; 544 ctx.page.expires += ttl*60;
528 if (method && !strcmp(method, "HEAD")) 545 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
529 ctx.cfg.nocache = 1; 546 ctx.cfg.nocache = 1;
530 if (ctx.cfg.nocache) 547 if (ctx.cfg.nocache)
531 ctx.cfg.cache_size = 0; 548 ctx.cfg.cache_size = 0;
532 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 549 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
533 ctx.qry.raw, ttl, process_request, &ctx); 550 ctx.qry.raw, ttl, process_request, &ctx);
534 if (err) 551 if (err)
535 cgit_print_error(fmt("Error processing page: %s (%d)", 552 cgit_print_error(fmt("Error processing page: %s (%d)",
536 strerror(err), err)); 553 strerror(err), err));
537 return err; 554 return err;
538} 555}
diff --git a/cgit.h b/cgit.h
index 4c854ea..d90ccdc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -82,192 +82,206 @@ struct cgit_repo {
82struct cgit_repolist { 82struct cgit_repolist {
83 int length; 83 int length;
84 int count; 84 int count;
85 struct cgit_repo *repos; 85 struct cgit_repo *repos;
86}; 86};
87 87
88struct commitinfo { 88struct commitinfo {
89 struct commit *commit; 89 struct commit *commit;
90 char *author; 90 char *author;
91 char *author_email; 91 char *author_email;
92 unsigned long author_date; 92 unsigned long author_date;
93 char *committer; 93 char *committer;
94 char *committer_email; 94 char *committer_email;
95 unsigned long committer_date; 95 unsigned long committer_date;
96 char *subject; 96 char *subject;
97 char *msg; 97 char *msg;
98 char *msg_encoding; 98 char *msg_encoding;
99}; 99};
100 100
101struct taginfo { 101struct taginfo {
102 char *tagger; 102 char *tagger;
103 char *tagger_email; 103 char *tagger_email;
104 unsigned long tagger_date; 104 unsigned long tagger_date;
105 char *msg; 105 char *msg;
106}; 106};
107 107
108struct refinfo { 108struct refinfo {
109 const char *refname; 109 const char *refname;
110 struct object *object; 110 struct object *object;
111 union { 111 union {
112 struct taginfo *tag; 112 struct taginfo *tag;
113 struct commitinfo *commit; 113 struct commitinfo *commit;
114 }; 114 };
115}; 115};
116 116
117struct reflist { 117struct reflist {
118 struct refinfo **refs; 118 struct refinfo **refs;
119 int alloc; 119 int alloc;
120 int count; 120 int count;
121}; 121};
122 122
123struct cgit_query { 123struct cgit_query {
124 int has_symref; 124 int has_symref;
125 int has_sha1; 125 int has_sha1;
126 char *raw; 126 char *raw;
127 char *repo; 127 char *repo;
128 char *page; 128 char *page;
129 char *search; 129 char *search;
130 char *grep; 130 char *grep;
131 char *head; 131 char *head;
132 char *sha1; 132 char *sha1;
133 char *sha2; 133 char *sha2;
134 char *path; 134 char *path;
135 char *name; 135 char *name;
136 char *mimetype; 136 char *mimetype;
137 char *url; 137 char *url;
138 char *period; 138 char *period;
139 int ofs; 139 int ofs;
140 int nohead; 140 int nohead;
141 char *sort; 141 char *sort;
142 int showmsg; 142 int showmsg;
143}; 143};
144 144
145struct cgit_config { 145struct cgit_config {
146 char *agefile; 146 char *agefile;
147 char *cache_root; 147 char *cache_root;
148 char *clone_prefix; 148 char *clone_prefix;
149 char *css; 149 char *css;
150 char *favicon; 150 char *favicon;
151 char *footer; 151 char *footer;
152 char *head_include; 152 char *head_include;
153 char *header; 153 char *header;
154 char *index_header; 154 char *index_header;
155 char *index_info; 155 char *index_info;
156 char *logo; 156 char *logo;
157 char *logo_link; 157 char *logo_link;
158 char *module_link; 158 char *module_link;
159 char *repo_group; 159 char *repo_group;
160 char *robots; 160 char *robots;
161 char *root_title; 161 char *root_title;
162 char *root_desc; 162 char *root_desc;
163 char *root_readme; 163 char *root_readme;
164 char *script_name; 164 char *script_name;
165 char *virtual_root; 165 char *virtual_root;
166 int cache_size; 166 int cache_size;
167 int cache_dynamic_ttl; 167 int cache_dynamic_ttl;
168 int cache_max_create_time; 168 int cache_max_create_time;
169 int cache_repo_ttl; 169 int cache_repo_ttl;
170 int cache_root_ttl; 170 int cache_root_ttl;
171 int cache_static_ttl; 171 int cache_static_ttl;
172 int embedded; 172 int embedded;
173 int enable_index_links; 173 int enable_index_links;
174 int enable_log_filecount; 174 int enable_log_filecount;
175 int enable_log_linecount; 175 int enable_log_linecount;
176 int local_time; 176 int local_time;
177 int max_repo_count; 177 int max_repo_count;
178 int max_commit_count; 178 int max_commit_count;
179 int max_lock_attempts; 179 int max_lock_attempts;
180 int max_msg_len; 180 int max_msg_len;
181 int max_repodesc_len; 181 int max_repodesc_len;
182 int max_stats; 182 int max_stats;
183 int nocache; 183 int nocache;
184 int noplainemail; 184 int noplainemail;
185 int noheader; 185 int noheader;
186 int renamelimit; 186 int renamelimit;
187 int snapshots; 187 int snapshots;
188 int summary_branches; 188 int summary_branches;
189 int summary_log; 189 int summary_log;
190 int summary_tags; 190 int summary_tags;
191 struct string_list mimetypes; 191 struct string_list mimetypes;
192 struct cgit_filter *about_filter; 192 struct cgit_filter *about_filter;
193 struct cgit_filter *commit_filter; 193 struct cgit_filter *commit_filter;
194 struct cgit_filter *source_filter; 194 struct cgit_filter *source_filter;
195}; 195};
196 196
197struct cgit_page { 197struct cgit_page {
198 time_t modified; 198 time_t modified;
199 time_t expires; 199 time_t expires;
200 size_t size; 200 size_t size;
201 char *mimetype; 201 char *mimetype;
202 char *charset; 202 char *charset;
203 char *filename; 203 char *filename;
204 char *etag; 204 char *etag;
205 char *title; 205 char *title;
206 int status; 206 int status;
207 char *statusmsg; 207 char *statusmsg;
208}; 208};
209 209
210struct cgit_environment {
211 char *cgit_config;
212 char *http_host;
213 char *https;
214 char *no_http;
215 char *path_info;
216 char *query_string;
217 char *request_method;
218 char *script_name;
219 char *server_name;
220 char *server_port;
221};
222
210struct cgit_context { 223struct cgit_context {
224 struct cgit_environment env;
211 struct cgit_query qry; 225 struct cgit_query qry;
212 struct cgit_config cfg; 226 struct cgit_config cfg;
213 struct cgit_repo *repo; 227 struct cgit_repo *repo;
214 struct cgit_page page; 228 struct cgit_page page;
215}; 229};
216 230
217struct cgit_snapshot_format { 231struct cgit_snapshot_format {
218 const char *suffix; 232 const char *suffix;
219 const char *mimetype; 233 const char *mimetype;
220 write_archive_fn_t write_func; 234 write_archive_fn_t write_func;
221 int bit; 235 int bit;
222}; 236};
223 237
224extern const char *cgit_version; 238extern const char *cgit_version;
225 239
226extern struct cgit_repolist cgit_repolist; 240extern struct cgit_repolist cgit_repolist;
227extern struct cgit_context ctx; 241extern struct cgit_context ctx;
228extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 242extern const struct cgit_snapshot_format cgit_snapshot_formats[];
229 243
230extern struct cgit_repo *cgit_add_repo(const char *url); 244extern struct cgit_repo *cgit_add_repo(const char *url);
231extern struct cgit_repo *cgit_get_repoinfo(const char *url); 245extern struct cgit_repo *cgit_get_repoinfo(const char *url);
232extern void cgit_repo_config_cb(const char *name, const char *value); 246extern void cgit_repo_config_cb(const char *name, const char *value);
233 247
234extern int chk_zero(int result, char *msg); 248extern int chk_zero(int result, char *msg);
235extern int chk_positive(int result, char *msg); 249extern int chk_positive(int result, char *msg);
236extern int chk_non_negative(int result, char *msg); 250extern int chk_non_negative(int result, char *msg);
237 251
238extern char *trim_end(const char *str, char c); 252extern char *trim_end(const char *str, char c);
239extern char *strlpart(char *txt, int maxlen); 253extern char *strlpart(char *txt, int maxlen);
240extern char *strrpart(char *txt, int maxlen); 254extern char *strrpart(char *txt, int maxlen);
241 255
242extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 256extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
243extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 257extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
244 int flags, void *cb_data); 258 int flags, void *cb_data);
245 259
246extern void *cgit_free_commitinfo(struct commitinfo *info); 260extern void *cgit_free_commitinfo(struct commitinfo *info);
247 261
248extern int cgit_diff_files(const unsigned char *old_sha1, 262extern int cgit_diff_files(const unsigned char *old_sha1,
249 const unsigned char *new_sha1, 263 const unsigned char *new_sha1,
250 unsigned long *old_size, unsigned long *new_size, 264 unsigned long *old_size, unsigned long *new_size,
251 int *binary, linediff_fn fn); 265 int *binary, linediff_fn fn);
252 266
253extern void cgit_diff_tree(const unsigned char *old_sha1, 267extern void cgit_diff_tree(const unsigned char *old_sha1,
254 const unsigned char *new_sha1, 268 const unsigned char *new_sha1,
255 filepair_fn fn, const char *prefix); 269 filepair_fn fn, const char *prefix);
256 270
257extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 271extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
258 272
259extern char *fmt(const char *format,...); 273extern char *fmt(const char *format,...);
260 274
261extern struct commitinfo *cgit_parse_commit(struct commit *commit); 275extern struct commitinfo *cgit_parse_commit(struct commit *commit);
262extern struct taginfo *cgit_parse_tag(struct tag *tag); 276extern struct taginfo *cgit_parse_tag(struct tag *tag);
263extern void cgit_parse_url(const char *url); 277extern void cgit_parse_url(const char *url);
264 278
265extern const char *cgit_repobasename(const char *reponame); 279extern const char *cgit_repobasename(const char *reponame);
266 280
267extern int cgit_parse_snapshots_mask(const char *str); 281extern int cgit_parse_snapshots_mask(const char *str);
268 282
269extern int cgit_open_filter(struct cgit_filter *filter); 283extern int cgit_open_filter(struct cgit_filter *filter);
270extern int cgit_close_filter(struct cgit_filter *filter); 284extern int cgit_close_filter(struct cgit_filter *filter);
271 285
272 286
273#endif /* CGIT_H */ 287#endif /* CGIT_H */
diff --git a/ui-shared.c b/ui-shared.c
index 015c52b..cf06511 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,193 +1,181 @@
1/* ui-shared.c: common web output functions 1/* ui-shared.c: common web output functions
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 "cmd.h" 10#include "cmd.h"
11#include "html.h" 11#include "html.h"
12 12
13const char cgit_doctype[] = 13const char cgit_doctype[] =
14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17static char *http_date(time_t t) 17static char *http_date(time_t t)
18{ 18{
19 static char day[][4] = 19 static char day[][4] =
20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
21 static char month[][4] = 21 static char month[][4] =
22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
24 struct tm *tm = gmtime(&t); 24 struct tm *tm = gmtime(&t);
25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
27 tm->tm_hour, tm->tm_min, tm->tm_sec); 27 tm->tm_hour, tm->tm_min, tm->tm_sec);
28} 28}
29 29
30void cgit_print_error(char *msg) 30void cgit_print_error(char *msg)
31{ 31{
32 html("<div class='error'>"); 32 html("<div class='error'>");
33 html_txt(msg); 33 html_txt(msg);
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_httpscheme() 37char *cgit_httpscheme()
38{ 38{
39 char *https; 39 if (ctx.env.https && !strcmp(ctx.env.https, "on"))
40
41 https = getenv("HTTPS");
42 if (https != NULL && strcmp(https, "on") == 0)
43 return "https://"; 40 return "https://";
44 else 41 else
45 return "http://"; 42 return "http://";
46} 43}
47 44
48char *cgit_hosturl() 45char *cgit_hosturl()
49{ 46{
50 char *host, *port; 47 if (ctx.env.http_host)
51 48 return ctx.env.http_host;
52 host = getenv("HTTP_HOST"); 49 if (!ctx.env.server_name)
53 if (host) { 50 return NULL;
54 host = xstrdup(host); 51 if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
55 } else { 52 return ctx.env.server_name;
56 host = getenv("SERVER_NAME"); 53 return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
57 if (!host)
58 return NULL;
59 port = getenv("SERVER_PORT");
60 if (port && atoi(port) != 80)
61 host = xstrdup(fmt("%s:%d", host, atoi(port)));
62 else
63 host = xstrdup(host);
64 }
65 return host;
66} 54}
67 55
68char *cgit_rooturl() 56char *cgit_rooturl()
69{ 57{
70 if (ctx.cfg.virtual_root) 58 if (ctx.cfg.virtual_root)
71 return fmt("%s/", ctx.cfg.virtual_root); 59 return fmt("%s/", ctx.cfg.virtual_root);
72 else 60 else
73 return ctx.cfg.script_name; 61 return ctx.cfg.script_name;
74} 62}
75 63
76char *cgit_repourl(const char *reponame) 64char *cgit_repourl(const char *reponame)
77{ 65{
78 if (ctx.cfg.virtual_root) { 66 if (ctx.cfg.virtual_root) {
79 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 67 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
80 } else { 68 } else {
81 return fmt("?r=%s", reponame); 69 return fmt("?r=%s", reponame);
82 } 70 }
83} 71}
84 72
85char *cgit_fileurl(const char *reponame, const char *pagename, 73char *cgit_fileurl(const char *reponame, const char *pagename,
86 const char *filename, const char *query) 74 const char *filename, const char *query)
87{ 75{
88 char *tmp; 76 char *tmp;
89 char *delim; 77 char *delim;
90 78
91 if (ctx.cfg.virtual_root) { 79 if (ctx.cfg.virtual_root) {
92 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, 80 tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
93 pagename, (filename ? filename:"")); 81 pagename, (filename ? filename:""));
94 delim = "?"; 82 delim = "?";
95 } else { 83 } else {
96 tmp = fmt("?url=%s/%s/%s", reponame, pagename, 84 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
97 (filename ? filename : "")); 85 (filename ? filename : ""));
98 delim = "&"; 86 delim = "&";
99 } 87 }
100 if (query) 88 if (query)
101 tmp = fmt("%s%s%s", tmp, delim, query); 89 tmp = fmt("%s%s%s", tmp, delim, query);
102 return tmp; 90 return tmp;
103} 91}
104 92
105char *cgit_pageurl(const char *reponame, const char *pagename, 93char *cgit_pageurl(const char *reponame, const char *pagename,
106 const char *query) 94 const char *query)
107{ 95{
108 return cgit_fileurl(reponame,pagename,0,query); 96 return cgit_fileurl(reponame,pagename,0,query);
109} 97}
110 98
111const char *cgit_repobasename(const char *reponame) 99const char *cgit_repobasename(const char *reponame)
112{ 100{
113 /* I assume we don't need to store more than one repo basename */ 101 /* I assume we don't need to store more than one repo basename */
114 static char rvbuf[1024]; 102 static char rvbuf[1024];
115 int p; 103 int p;
116 const char *rv; 104 const char *rv;
117 strncpy(rvbuf,reponame,sizeof(rvbuf)); 105 strncpy(rvbuf,reponame,sizeof(rvbuf));
118 if(rvbuf[sizeof(rvbuf)-1]) 106 if(rvbuf[sizeof(rvbuf)-1])
119 die("cgit_repobasename: truncated repository name '%s'", reponame); 107 die("cgit_repobasename: truncated repository name '%s'", reponame);
120 p = strlen(rvbuf)-1; 108 p = strlen(rvbuf)-1;
121 /* strip trailing slashes */ 109 /* strip trailing slashes */
122 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 110 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
123 /* strip trailing .git */ 111 /* strip trailing .git */
124 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 112 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
125 p -= 3; rvbuf[p--] = 0; 113 p -= 3; rvbuf[p--] = 0;
126 } 114 }
127 /* strip more trailing slashes if any */ 115 /* strip more trailing slashes if any */
128 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 116 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
129 /* find last slash in the remaining string */ 117 /* find last slash in the remaining string */
130 rv = strrchr(rvbuf,'/'); 118 rv = strrchr(rvbuf,'/');
131 if(rv) 119 if(rv)
132 return ++rv; 120 return ++rv;
133 return rvbuf; 121 return rvbuf;
134} 122}
135 123
136char *cgit_currurl() 124char *cgit_currurl()
137{ 125{
138 if (!ctx.cfg.virtual_root) 126 if (!ctx.cfg.virtual_root)
139 return ctx.cfg.script_name; 127 return ctx.cfg.script_name;
140 else if (ctx.qry.page) 128 else if (ctx.qry.page)
141 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 129 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
142 else if (ctx.qry.repo) 130 else if (ctx.qry.repo)
143 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 131 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
144 else 132 else
145 return fmt("%s/", ctx.cfg.virtual_root); 133 return fmt("%s/", ctx.cfg.virtual_root);
146} 134}
147 135
148static void site_url(char *page, char *search, int ofs) 136static void site_url(char *page, char *search, int ofs)
149{ 137{
150 char *delim = "?"; 138 char *delim = "?";
151 139
152 if (ctx.cfg.virtual_root) { 140 if (ctx.cfg.virtual_root) {
153 html_attr(ctx.cfg.virtual_root); 141 html_attr(ctx.cfg.virtual_root);
154 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
155 html("/"); 143 html("/");
156 } else 144 } else
157 html(ctx.cfg.script_name); 145 html(ctx.cfg.script_name);
158 146
159 if (page) { 147 if (page) {
160 htmlf("?p=%s", page); 148 htmlf("?p=%s", page);
161 delim = "&"; 149 delim = "&";
162 } 150 }
163 if (search) { 151 if (search) {
164 html(delim); 152 html(delim);
165 html("q="); 153 html("q=");
166 html_attr(search); 154 html_attr(search);
167 delim = "&"; 155 delim = "&";
168 } 156 }
169 if (ofs) { 157 if (ofs) {
170 html(delim); 158 html(delim);
171 htmlf("ofs=%d", ofs); 159 htmlf("ofs=%d", ofs);
172 } 160 }
173} 161}
174 162
175static void site_link(char *page, char *name, char *title, char *class, 163static void site_link(char *page, char *name, char *title, char *class,
176 char *search, int ofs) 164 char *search, int ofs)
177{ 165{
178 html("<a"); 166 html("<a");
179 if (title) { 167 if (title) {
180 html(" title='"); 168 html(" title='");
181 html_attr(title); 169 html_attr(title);
182 html("'"); 170 html("'");
183 } 171 }
184 if (class) { 172 if (class) {
185 html(" class='"); 173 html(" class='");
186 html_attr(class); 174 html_attr(class);
187 html("'"); 175 html("'");
188 } 176 }
189 html(" href='"); 177 html(" href='");
190 site_url(page, search, ofs); 178 site_url(page, search, ofs);
191 html("'>"); 179 html("'>");
192 html_txt(name); 180 html_txt(name);
193 html("</a>"); 181 html("</a>");
@@ -342,335 +330,340 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
342 330
343void cgit_refs_link(char *name, char *title, char *class, char *head, 331void cgit_refs_link(char *name, char *title, char *class, char *head,
344 char *rev, char *path) 332 char *rev, char *path)
345{ 333{
346 reporevlink("refs", name, title, class, head, rev, path); 334 reporevlink("refs", name, title, class, head, rev, path);
347} 335}
348 336
349void cgit_snapshot_link(char *name, char *title, char *class, char *head, 337void cgit_snapshot_link(char *name, char *title, char *class, char *head,
350 char *rev, char *archivename) 338 char *rev, char *archivename)
351{ 339{
352 reporevlink("snapshot", name, title, class, head, rev, archivename); 340 reporevlink("snapshot", name, title, class, head, rev, archivename);
353} 341}
354 342
355void cgit_diff_link(char *name, char *title, char *class, char *head, 343void cgit_diff_link(char *name, char *title, char *class, char *head,
356 char *new_rev, char *old_rev, char *path) 344 char *new_rev, char *old_rev, char *path)
357{ 345{
358 char *delim; 346 char *delim;
359 347
360 delim = repolink(title, class, "diff", head, path); 348 delim = repolink(title, class, "diff", head, path);
361 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 349 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
362 html(delim); 350 html(delim);
363 html("id="); 351 html("id=");
364 html_url_arg(new_rev); 352 html_url_arg(new_rev);
365 delim = "&amp;"; 353 delim = "&amp;";
366 } 354 }
367 if (old_rev) { 355 if (old_rev) {
368 html(delim); 356 html(delim);
369 html("id2="); 357 html("id2=");
370 html_url_arg(old_rev); 358 html_url_arg(old_rev);
371 } 359 }
372 html("'>"); 360 html("'>");
373 html_txt(name); 361 html_txt(name);
374 html("</a>"); 362 html("</a>");
375} 363}
376 364
377void cgit_patch_link(char *name, char *title, char *class, char *head, 365void cgit_patch_link(char *name, char *title, char *class, char *head,
378 char *rev) 366 char *rev)
379{ 367{
380 reporevlink("patch", name, title, class, head, rev, NULL); 368 reporevlink("patch", name, title, class, head, rev, NULL);
381} 369}
382 370
383void cgit_stats_link(char *name, char *title, char *class, char *head, 371void cgit_stats_link(char *name, char *title, char *class, char *head,
384 char *path) 372 char *path)
385{ 373{
386 reporevlink("stats", name, title, class, head, NULL, path); 374 reporevlink("stats", name, title, class, head, NULL, path);
387} 375}
388 376
389void cgit_object_link(struct object *obj) 377void cgit_object_link(struct object *obj)
390{ 378{
391 char *page, *shortrev, *fullrev, *name; 379 char *page, *shortrev, *fullrev, *name;
392 380
393 fullrev = sha1_to_hex(obj->sha1); 381 fullrev = sha1_to_hex(obj->sha1);
394 shortrev = xstrdup(fullrev); 382 shortrev = xstrdup(fullrev);
395 shortrev[10] = '\0'; 383 shortrev[10] = '\0';
396 if (obj->type == OBJ_COMMIT) { 384 if (obj->type == OBJ_COMMIT) {
397 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, 385 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
398 ctx.qry.head, fullrev); 386 ctx.qry.head, fullrev);
399 return; 387 return;
400 } else if (obj->type == OBJ_TREE) 388 } else if (obj->type == OBJ_TREE)
401 page = "tree"; 389 page = "tree";
402 else if (obj->type == OBJ_TAG) 390 else if (obj->type == OBJ_TAG)
403 page = "tag"; 391 page = "tag";
404 else 392 else
405 page = "blob"; 393 page = "blob";
406 name = fmt("%s %s...", typename(obj->type), shortrev); 394 name = fmt("%s %s...", typename(obj->type), shortrev);
407 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); 395 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
408} 396}
409 397
410void cgit_print_date(time_t secs, char *format, int local_time) 398void cgit_print_date(time_t secs, char *format, int local_time)
411{ 399{
412 char buf[64]; 400 char buf[64];
413 struct tm *time; 401 struct tm *time;
414 402
415 if (!secs) 403 if (!secs)
416 return; 404 return;
417 if(local_time) 405 if(local_time)
418 time = localtime(&secs); 406 time = localtime(&secs);
419 else 407 else
420 time = gmtime(&secs); 408 time = gmtime(&secs);
421 strftime(buf, sizeof(buf)-1, format, time); 409 strftime(buf, sizeof(buf)-1, format, time);
422 html_txt(buf); 410 html_txt(buf);
423} 411}
424 412
425void cgit_print_age(time_t t, time_t max_relative, char *format) 413void cgit_print_age(time_t t, time_t max_relative, char *format)
426{ 414{
427 time_t now, secs; 415 time_t now, secs;
428 416
429 if (!t) 417 if (!t)
430 return; 418 return;
431 time(&now); 419 time(&now);
432 secs = now - t; 420 secs = now - t;
433 421
434 if (secs > max_relative && max_relative >= 0) { 422 if (secs > max_relative && max_relative >= 0) {
435 cgit_print_date(t, format, ctx.cfg.local_time); 423 cgit_print_date(t, format, ctx.cfg.local_time);
436 return; 424 return;
437 } 425 }
438 426
439 if (secs < TM_HOUR * 2) { 427 if (secs < TM_HOUR * 2) {
440 htmlf("<span class='age-mins'>%.0f min.</span>", 428 htmlf("<span class='age-mins'>%.0f min.</span>",
441 secs * 1.0 / TM_MIN); 429 secs * 1.0 / TM_MIN);
442 return; 430 return;
443 } 431 }
444 if (secs < TM_DAY * 2) { 432 if (secs < TM_DAY * 2) {
445 htmlf("<span class='age-hours'>%.0f hours</span>", 433 htmlf("<span class='age-hours'>%.0f hours</span>",
446 secs * 1.0 / TM_HOUR); 434 secs * 1.0 / TM_HOUR);
447 return; 435 return;
448 } 436 }
449 if (secs < TM_WEEK * 2) { 437 if (secs < TM_WEEK * 2) {
450 htmlf("<span class='age-days'>%.0f days</span>", 438 htmlf("<span class='age-days'>%.0f days</span>",
451 secs * 1.0 / TM_DAY); 439 secs * 1.0 / TM_DAY);
452 return; 440 return;
453 } 441 }
454 if (secs < TM_MONTH * 2) { 442 if (secs < TM_MONTH * 2) {
455 htmlf("<span class='age-weeks'>%.0f weeks</span>", 443 htmlf("<span class='age-weeks'>%.0f weeks</span>",
456 secs * 1.0 / TM_WEEK); 444 secs * 1.0 / TM_WEEK);
457 return; 445 return;
458 } 446 }
459 if (secs < TM_YEAR * 2) { 447 if (secs < TM_YEAR * 2) {
460 htmlf("<span class='age-months'>%.0f months</span>", 448 htmlf("<span class='age-months'>%.0f months</span>",
461 secs * 1.0 / TM_MONTH); 449 secs * 1.0 / TM_MONTH);
462 return; 450 return;
463 } 451 }
464 htmlf("<span class='age-years'>%.0f years</span>", 452 htmlf("<span class='age-years'>%.0f years</span>",
465 secs * 1.0 / TM_YEAR); 453 secs * 1.0 / TM_YEAR);
466} 454}
467 455
468void cgit_print_http_headers(struct cgit_context *ctx) 456void cgit_print_http_headers(struct cgit_context *ctx)
469{ 457{
470 const char *method = getenv("REQUEST_METHOD"); 458 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
471
472 if (ctx->cfg.embedded)
473 return; 459 return;
474 460
475 if (ctx->page.status) 461 if (ctx->page.status)
476 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
477 if (ctx->page.mimetype && ctx->page.charset) 463 if (ctx->page.mimetype && ctx->page.charset)
478 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 464 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
479 ctx->page.charset); 465 ctx->page.charset);
480 else if (ctx->page.mimetype) 466 else if (ctx->page.mimetype)
481 htmlf("Content-Type: %s\n", ctx->page.mimetype); 467 htmlf("Content-Type: %s\n", ctx->page.mimetype);
482 if (ctx->page.size) 468 if (ctx->page.size)
483 htmlf("Content-Length: %ld\n", ctx->page.size); 469 htmlf("Content-Length: %ld\n", ctx->page.size);
484 if (ctx->page.filename) 470 if (ctx->page.filename)
485 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 471 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
486 ctx->page.filename); 472 ctx->page.filename);
487 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 473 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
488 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 474 htmlf("Expires: %s\n", http_date(ctx->page.expires));
489 if (ctx->page.etag) 475 if (ctx->page.etag)
490 htmlf("ETag: \"%s\"\n", ctx->page.etag); 476 htmlf("ETag: \"%s\"\n", ctx->page.etag);
491 html("\n"); 477 html("\n");
492 if (method && !strcmp(method, "HEAD")) 478 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
493 exit(0); 479 exit(0);
494} 480}
495 481
496void cgit_print_docstart(struct cgit_context *ctx) 482void cgit_print_docstart(struct cgit_context *ctx)
497{ 483{
498 if (ctx->cfg.embedded) 484 if (ctx->cfg.embedded) {
485 if (ctx->cfg.header)
486 html_include(ctx->cfg.header);
499 return; 487 return;
488 }
500 489
501 char *host = cgit_hosturl(); 490 char *host = cgit_hosturl();
502 html(cgit_doctype); 491 html(cgit_doctype);
503 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 492 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
504 html("<head>\n"); 493 html("<head>\n");
505 html("<title>"); 494 html("<title>");
506 html_txt(ctx->page.title); 495 html_txt(ctx->page.title);
507 html("</title>\n"); 496 html("</title>\n");
508 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 497 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
509 if (ctx->cfg.robots && *ctx->cfg.robots) 498 if (ctx->cfg.robots && *ctx->cfg.robots)
510 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 499 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
511 html("<link rel='stylesheet' type='text/css' href='"); 500 html("<link rel='stylesheet' type='text/css' href='");
512 html_attr(ctx->cfg.css); 501 html_attr(ctx->cfg.css);
513 html("'/>\n"); 502 html("'/>\n");
514 if (ctx->cfg.favicon) { 503 if (ctx->cfg.favicon) {
515 html("<link rel='shortcut icon' href='"); 504 html("<link rel='shortcut icon' href='");
516 html_attr(ctx->cfg.favicon); 505 html_attr(ctx->cfg.favicon);
517 html("'/>\n"); 506 html("'/>\n");
518 } 507 }
519 if (host && ctx->repo) { 508 if (host && ctx->repo) {
520 html("<link rel='alternate' title='Atom feed' href='"); 509 html("<link rel='alternate' title='Atom feed' href='");
521 html(cgit_httpscheme()); 510 html(cgit_httpscheme());
522 html_attr(cgit_hosturl()); 511 html_attr(cgit_hosturl());
523 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 512 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
524 fmt("h=%s", ctx->qry.head))); 513 fmt("h=%s", ctx->qry.head)));
525 html("' type='application/atom+xml'/>\n"); 514 html("' type='application/atom+xml'/>\n");
526 } 515 }
527 if (ctx->cfg.head_include) 516 if (ctx->cfg.head_include)
528 html_include(ctx->cfg.head_include); 517 html_include(ctx->cfg.head_include);
529 html("</head>\n"); 518 html("</head>\n");
530 html("<body>\n"); 519 html("<body>\n");
531 if (ctx->cfg.header) 520 if (ctx->cfg.header)
532 html_include(ctx->cfg.header); 521 html_include(ctx->cfg.header);
533} 522}
534 523
535void cgit_print_docend() 524void cgit_print_docend()
536{ 525{
537 html("</div>"); 526 html("</div> <!-- class=content -->\n");
527 if (ctx.cfg.embedded) {
528 html("</div> <!-- id=cgit -->\n");
529 if (ctx.cfg.footer)
530 html_include(ctx.cfg.footer);
531 return;
532 }
538 if (ctx.cfg.footer) 533 if (ctx.cfg.footer)
539 html_include(ctx.cfg.footer); 534 html_include(ctx.cfg.footer);
540 else { 535 else {
541 htmlf("<div class='footer'>generated by cgit %s at ", 536 htmlf("<div class='footer'>generated by cgit %s at ",
542 cgit_version); 537 cgit_version);
543 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 538 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
544 html("</div>\n"); 539 html("</div>\n");
545 } 540 }
546 html("</div>"); 541 html("</div> <!-- id=cgit -->\n");
547 if (ctx.cfg.embedded)
548 return;
549 html("</body>\n</html>\n"); 542 html("</body>\n</html>\n");
550} 543}
551 544
552int print_branch_option(const char *refname, const unsigned char *sha1, 545int print_branch_option(const char *refname, const unsigned char *sha1,
553 int flags, void *cb_data) 546 int flags, void *cb_data)
554{ 547{
555 char *name = (char *)refname; 548 char *name = (char *)refname;
556 html_option(name, name, ctx.qry.head); 549 html_option(name, name, ctx.qry.head);
557 return 0; 550 return 0;
558} 551}
559 552
560int print_archive_ref(const char *refname, const unsigned char *sha1, 553int print_archive_ref(const char *refname, const unsigned char *sha1,
561 int flags, void *cb_data) 554 int flags, void *cb_data)
562{ 555{
563 struct tag *tag; 556 struct tag *tag;
564 struct taginfo *info; 557 struct taginfo *info;
565 struct object *obj; 558 struct object *obj;
566 char buf[256], *url; 559 char buf[256], *url;
567 unsigned char fileid[20]; 560 unsigned char fileid[20];
568 int *header = (int *)cb_data; 561 int *header = (int *)cb_data;
569 562
570 if (prefixcmp(refname, "refs/archives")) 563 if (prefixcmp(refname, "refs/archives"))
571 return 0; 564 return 0;
572 strncpy(buf, refname+14, sizeof(buf)); 565 strncpy(buf, refname+14, sizeof(buf));
573 obj = parse_object(sha1); 566 obj = parse_object(sha1);
574 if (!obj) 567 if (!obj)
575 return 1; 568 return 1;
576 if (obj->type == OBJ_TAG) { 569 if (obj->type == OBJ_TAG) {
577 tag = lookup_tag(sha1); 570 tag = lookup_tag(sha1);
578 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 571 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
579 return 0; 572 return 0;
580 hashcpy(fileid, tag->tagged->sha1); 573 hashcpy(fileid, tag->tagged->sha1);
581 } else if (obj->type != OBJ_BLOB) { 574 } else if (obj->type != OBJ_BLOB) {
582 return 0; 575 return 0;
583 } else { 576 } else {
584 hashcpy(fileid, sha1); 577 hashcpy(fileid, sha1);
585 } 578 }
586 if (!*header) { 579 if (!*header) {
587 html("<h1>download</h1>\n"); 580 html("<h1>download</h1>\n");
588 *header = 1; 581 *header = 1;
589 } 582 }
590 url = cgit_pageurl(ctx.qry.repo, "blob", 583 url = cgit_pageurl(ctx.qry.repo, "blob",
591 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 584 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
592 buf)); 585 buf));
593 html_link_open(url, NULL, "menu"); 586 html_link_open(url, NULL, "menu");
594 html_txt(strlpart(buf, 20)); 587 html_txt(strlpart(buf, 20));
595 html_link_close(); 588 html_link_close();
596 return 0; 589 return 0;
597} 590}
598 591
599void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) 592void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
600{ 593{
601 char *url; 594 char *url;
602 595
603 if (!ctx.cfg.virtual_root) { 596 if (!ctx.cfg.virtual_root) {
604 url = fmt("%s/%s", ctx.qry.repo, page); 597 url = fmt("%s/%s", ctx.qry.repo, page);
605 if (ctx.qry.path) 598 if (ctx.qry.path)
606 url = fmt("%s/%s", url, ctx.qry.path); 599 url = fmt("%s/%s", url, ctx.qry.path);
607 html_hidden("url", url); 600 html_hidden("url", url);
608 } 601 }
609 602
610 if (incl_head && ctx.qry.head && ctx.repo->defbranch && 603 if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
611 strcmp(ctx.qry.head, ctx.repo->defbranch)) 604 strcmp(ctx.qry.head, ctx.repo->defbranch))
612 html_hidden("h", ctx.qry.head); 605 html_hidden("h", ctx.qry.head);
613 606
614 if (ctx.qry.sha1) 607 if (ctx.qry.sha1)
615 html_hidden("id", ctx.qry.sha1); 608 html_hidden("id", ctx.qry.sha1);
616 if (ctx.qry.sha2) 609 if (ctx.qry.sha2)
617 html_hidden("id2", ctx.qry.sha2); 610 html_hidden("id2", ctx.qry.sha2);
618 if (ctx.qry.showmsg) 611 if (ctx.qry.showmsg)
619 html_hidden("showmsg", "1"); 612 html_hidden("showmsg", "1");
620 613
621 if (incl_search) { 614 if (incl_search) {
622 if (ctx.qry.grep) 615 if (ctx.qry.grep)
623 html_hidden("qt", ctx.qry.grep); 616 html_hidden("qt", ctx.qry.grep);
624 if (ctx.qry.search) 617 if (ctx.qry.search)
625 html_hidden("q", ctx.qry.search); 618 html_hidden("q", ctx.qry.search);
626 } 619 }
627} 620}
628 621
629const char *fallback_cmd = "repolist"; 622const char *fallback_cmd = "repolist";
630 623
631char *hc(struct cgit_cmd *cmd, const char *page) 624char *hc(struct cgit_cmd *cmd, const char *page)
632{ 625{
633 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); 626 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
634} 627}
635 628
636static void print_header(struct cgit_context *ctx) 629static void print_header(struct cgit_context *ctx)
637{ 630{
638 html("<table id='header'>\n"); 631 html("<table id='header'>\n");
639 html("<tr>\n"); 632 html("<tr>\n");
640 html("<td class='logo' rowspan='2'><a href='"); 633 html("<td class='logo' rowspan='2'><a href='");
641 if (ctx->cfg.logo_link) 634 if (ctx->cfg.logo_link)
642 html_attr(ctx->cfg.logo_link); 635 html_attr(ctx->cfg.logo_link);
643 else 636 else
644 html_attr(cgit_rooturl()); 637 html_attr(cgit_rooturl());
645 html("'><img src='"); 638 html("'><img src='");
646 html_attr(ctx->cfg.logo); 639 html_attr(ctx->cfg.logo);
647 html("' alt='cgit logo'/></a></td>\n"); 640 html("' alt='cgit logo'/></a></td>\n");
648 641
649 html("<td class='main'>"); 642 html("<td class='main'>");
650 if (ctx->repo) { 643 if (ctx->repo) {
651 cgit_index_link("index", NULL, NULL, NULL, 0); 644 cgit_index_link("index", NULL, NULL, NULL, 0);
652 html(" : "); 645 html(" : ");
653 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); 646 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
654 html("</td><td class='form'>"); 647 html("</td><td class='form'>");
655 html("<form method='get' action=''>\n"); 648 html("<form method='get' action=''>\n");
656 cgit_add_hidden_formfields(0, 1, ctx->qry.page); 649 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
657 html("<select name='h' onchange='this.form.submit();'>\n"); 650 html("<select name='h' onchange='this.form.submit();'>\n");
658 for_each_branch_ref(print_branch_option, ctx->qry.head); 651 for_each_branch_ref(print_branch_option, ctx->qry.head);
659 html("</select> "); 652 html("</select> ");
660 html("<input type='submit' name='' value='switch'/>"); 653 html("<input type='submit' name='' value='switch'/>");
661 html("</form>"); 654 html("</form>");
662 } else 655 } else
663 html_txt(ctx->cfg.root_title); 656 html_txt(ctx->cfg.root_title);
664 html("</td></tr>\n"); 657 html("</td></tr>\n");
665 658
666 html("<tr><td class='sub'>"); 659 html("<tr><td class='sub'>");
667 if (ctx->repo) { 660 if (ctx->repo) {
668 html_txt(ctx->repo->desc); 661 html_txt(ctx->repo->desc);
669 html("</td><td class='sub right'>"); 662 html("</td><td class='sub right'>");
670 html_txt(ctx->repo->owner); 663 html_txt(ctx->repo->owner);
671 } else { 664 } else {
672 if (ctx->cfg.root_desc) 665 if (ctx->cfg.root_desc)
673 html_txt(ctx->cfg.root_desc); 666 html_txt(ctx->cfg.root_desc);
674 else if (ctx->cfg.index_info) 667 else if (ctx->cfg.index_info)
675 html_include(ctx->cfg.index_info); 668 html_include(ctx->cfg.index_info);
676 } 669 }