author | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 07:20:17 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 07:20:17 (UTC) |
commit | 8b2252b0b61617e9de9d9e9ba743881ad62523af (patch) (unidiff) | |
tree | 2d0f02d2c4a213644a1031a88af6578c032edbe6 | |
parent | 60a26272e0ca529407fe6b613f061f04ba585d53 (diff) | |
download | cgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.zip cgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.gz cgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.bz2 |
ui-shared: add support for NO_HTTP=1/--nohttp
cgit_print_http_headers() used to do nothing if 'embedded' was
specified in cgitrc, but that was wrong - we never want to skip the
headers when invoked as a CGI app. Sadly, there's no easy way to
detect if we're invoked as a CGI app or if we're invoked by another
CGI app, so for the latter case cgit needs to be invoked with either
--nohttp on the command line or NO_HTTP=1 in the environment.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -160,384 +160,388 @@ void config_cb(const char *name, const char *value) | |||
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 | ||
178 | static void querystring_cb(const char *name, const char *value) | 178 | static 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 | ||
218 | char *xstrdupn(const char *str) | 218 | char *xstrdupn(const char *str) |
219 | { | 219 | { |
220 | return (str ? xstrdup(str) : NULL); | 220 | return (str ? xstrdup(str) : NULL); |
221 | } | 221 | } |
222 | 222 | ||
223 | static void prepare_context(struct cgit_context *ctx) | 223 | static void prepare_context(struct cgit_context *ctx) |
224 | { | 224 | { |
225 | memset(ctx, 0, sizeof(ctx)); | 225 | memset(ctx, 0, sizeof(ctx)); |
226 | ctx->cfg.agefile = "info/web/last-modified"; | 226 | ctx->cfg.agefile = "info/web/last-modified"; |
227 | ctx->cfg.nocache = 0; | 227 | ctx->cfg.nocache = 0; |
228 | ctx->cfg.cache_size = 0; | 228 | ctx->cfg.cache_size = 0; |
229 | ctx->cfg.cache_dynamic_ttl = 5; | 229 | ctx->cfg.cache_dynamic_ttl = 5; |
230 | ctx->cfg.cache_max_create_time = 5; | 230 | ctx->cfg.cache_max_create_time = 5; |
231 | ctx->cfg.cache_repo_ttl = 5; | 231 | ctx->cfg.cache_repo_ttl = 5; |
232 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 232 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
233 | ctx->cfg.cache_root_ttl = 5; | 233 | ctx->cfg.cache_root_ttl = 5; |
234 | ctx->cfg.cache_static_ttl = -1; | 234 | ctx->cfg.cache_static_ttl = -1; |
235 | ctx->cfg.css = "/cgit.css"; | 235 | ctx->cfg.css = "/cgit.css"; |
236 | ctx->cfg.logo = "/git-logo.png"; | 236 | ctx->cfg.logo = "/git-logo.png"; |
237 | ctx->cfg.local_time = 0; | 237 | ctx->cfg.local_time = 0; |
238 | ctx->cfg.max_repo_count = 50; | 238 | ctx->cfg.max_repo_count = 50; |
239 | ctx->cfg.max_commit_count = 50; | 239 | ctx->cfg.max_commit_count = 50; |
240 | ctx->cfg.max_lock_attempts = 5; | 240 | ctx->cfg.max_lock_attempts = 5; |
241 | ctx->cfg.max_msg_len = 80; | 241 | ctx->cfg.max_msg_len = 80; |
242 | ctx->cfg.max_repodesc_len = 80; | 242 | ctx->cfg.max_repodesc_len = 80; |
243 | ctx->cfg.max_stats = 0; | 243 | ctx->cfg.max_stats = 0; |
244 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 244 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
245 | ctx->cfg.renamelimit = -1; | 245 | ctx->cfg.renamelimit = -1; |
246 | ctx->cfg.robots = "index, nofollow"; | 246 | ctx->cfg.robots = "index, nofollow"; |
247 | ctx->cfg.root_title = "Git repository browser"; | 247 | ctx->cfg.root_title = "Git repository browser"; |
248 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 248 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
249 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 249 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
250 | ctx->cfg.summary_branches = 10; | 250 | ctx->cfg.summary_branches = 10; |
251 | ctx->cfg.summary_log = 10; | 251 | ctx->cfg.summary_log = 10; |
252 | ctx->cfg.summary_tags = 10; | 252 | ctx->cfg.summary_tags = 10; |
253 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 253 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
254 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 254 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
255 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 255 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
256 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | ||
256 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 257 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
257 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 258 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
258 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 259 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
259 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 260 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
260 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 261 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
261 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 262 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
262 | ctx->page.mimetype = "text/html"; | 263 | ctx->page.mimetype = "text/html"; |
263 | ctx->page.charset = PAGE_ENCODING; | 264 | ctx->page.charset = PAGE_ENCODING; |
264 | ctx->page.filename = NULL; | 265 | ctx->page.filename = NULL; |
265 | ctx->page.size = 0; | 266 | ctx->page.size = 0; |
266 | ctx->page.modified = time(NULL); | 267 | ctx->page.modified = time(NULL); |
267 | ctx->page.expires = ctx->page.modified; | 268 | ctx->page.expires = ctx->page.modified; |
268 | ctx->page.etag = NULL; | 269 | ctx->page.etag = NULL; |
269 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 270 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
270 | if (ctx->env.script_name) | 271 | if (ctx->env.script_name) |
271 | ctx->cfg.script_name = ctx->env.script_name; | 272 | ctx->cfg.script_name = ctx->env.script_name; |
272 | if (ctx->env.query_string) | 273 | if (ctx->env.query_string) |
273 | ctx->qry.raw = ctx->env.query_string; | 274 | ctx->qry.raw = ctx->env.query_string; |
274 | if (!ctx->env.cgit_config) | 275 | if (!ctx->env.cgit_config) |
275 | ctx->env.cgit_config = CGIT_CONFIG; | 276 | ctx->env.cgit_config = CGIT_CONFIG; |
276 | } | 277 | } |
277 | 278 | ||
278 | struct refmatch { | 279 | struct refmatch { |
279 | char *req_ref; | 280 | char *req_ref; |
280 | char *first_ref; | 281 | char *first_ref; |
281 | int match; | 282 | int match; |
282 | }; | 283 | }; |
283 | 284 | ||
284 | int find_current_ref(const char *refname, const unsigned char *sha1, | 285 | int find_current_ref(const char *refname, const unsigned char *sha1, |
285 | int flags, void *cb_data) | 286 | int flags, void *cb_data) |
286 | { | 287 | { |
287 | struct refmatch *info; | 288 | struct refmatch *info; |
288 | 289 | ||
289 | info = (struct refmatch *)cb_data; | 290 | info = (struct refmatch *)cb_data; |
290 | if (!strcmp(refname, info->req_ref)) | 291 | if (!strcmp(refname, info->req_ref)) |
291 | info->match = 1; | 292 | info->match = 1; |
292 | if (!info->first_ref) | 293 | if (!info->first_ref) |
293 | info->first_ref = xstrdup(refname); | 294 | info->first_ref = xstrdup(refname); |
294 | return info->match; | 295 | return info->match; |
295 | } | 296 | } |
296 | 297 | ||
297 | char *find_default_branch(struct cgit_repo *repo) | 298 | char *find_default_branch(struct cgit_repo *repo) |
298 | { | 299 | { |
299 | struct refmatch info; | 300 | struct refmatch info; |
300 | char *ref; | 301 | char *ref; |
301 | 302 | ||
302 | info.req_ref = repo->defbranch; | 303 | info.req_ref = repo->defbranch; |
303 | info.first_ref = NULL; | 304 | info.first_ref = NULL; |
304 | info.match = 0; | 305 | info.match = 0; |
305 | for_each_branch_ref(find_current_ref, &info); | 306 | for_each_branch_ref(find_current_ref, &info); |
306 | if (info.match) | 307 | if (info.match) |
307 | ref = info.req_ref; | 308 | ref = info.req_ref; |
308 | else | 309 | else |
309 | ref = info.first_ref; | 310 | ref = info.first_ref; |
310 | if (ref) | 311 | if (ref) |
311 | ref = xstrdup(ref); | 312 | ref = xstrdup(ref); |
312 | return ref; | 313 | return ref; |
313 | } | 314 | } |
314 | 315 | ||
315 | static int prepare_repo_cmd(struct cgit_context *ctx) | 316 | static int prepare_repo_cmd(struct cgit_context *ctx) |
316 | { | 317 | { |
317 | char *tmp; | 318 | char *tmp; |
318 | unsigned char sha1[20]; | 319 | unsigned char sha1[20]; |
319 | int nongit = 0; | 320 | int nongit = 0; |
320 | 321 | ||
321 | setenv("GIT_DIR", ctx->repo->path, 1); | 322 | setenv("GIT_DIR", ctx->repo->path, 1); |
322 | setup_git_directory_gently(&nongit); | 323 | setup_git_directory_gently(&nongit); |
323 | if (nongit) { | 324 | if (nongit) { |
324 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 325 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
325 | "config error"); | 326 | "config error"); |
326 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 327 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
327 | ctx->repo = NULL; | 328 | ctx->repo = NULL; |
328 | cgit_print_http_headers(ctx); | 329 | cgit_print_http_headers(ctx); |
329 | cgit_print_docstart(ctx); | 330 | cgit_print_docstart(ctx); |
330 | cgit_print_pageheader(ctx); | 331 | cgit_print_pageheader(ctx); |
331 | cgit_print_error(tmp); | 332 | cgit_print_error(tmp); |
332 | cgit_print_docend(); | 333 | cgit_print_docend(); |
333 | return 1; | 334 | return 1; |
334 | } | 335 | } |
335 | 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); |
336 | 337 | ||
337 | if (!ctx->qry.head) { | 338 | if (!ctx->qry.head) { |
338 | ctx->qry.nohead = 1; | 339 | ctx->qry.nohead = 1; |
339 | ctx->qry.head = find_default_branch(ctx->repo); | 340 | ctx->qry.head = find_default_branch(ctx->repo); |
340 | ctx->repo->defbranch = ctx->qry.head; | 341 | ctx->repo->defbranch = ctx->qry.head; |
341 | } | 342 | } |
342 | 343 | ||
343 | if (!ctx->qry.head) { | 344 | if (!ctx->qry.head) { |
344 | cgit_print_http_headers(ctx); | 345 | cgit_print_http_headers(ctx); |
345 | cgit_print_docstart(ctx); | 346 | cgit_print_docstart(ctx); |
346 | cgit_print_pageheader(ctx); | 347 | cgit_print_pageheader(ctx); |
347 | cgit_print_error("Repository seems to be empty"); | 348 | cgit_print_error("Repository seems to be empty"); |
348 | cgit_print_docend(); | 349 | cgit_print_docend(); |
349 | return 1; | 350 | return 1; |
350 | } | 351 | } |
351 | 352 | ||
352 | if (get_sha1(ctx->qry.head, sha1)) { | 353 | if (get_sha1(ctx->qry.head, sha1)) { |
353 | tmp = xstrdup(ctx->qry.head); | 354 | tmp = xstrdup(ctx->qry.head); |
354 | ctx->qry.head = ctx->repo->defbranch; | 355 | ctx->qry.head = ctx->repo->defbranch; |
355 | ctx->page.status = 404; | 356 | ctx->page.status = 404; |
356 | ctx->page.statusmsg = "not found"; | 357 | ctx->page.statusmsg = "not found"; |
357 | cgit_print_http_headers(ctx); | 358 | cgit_print_http_headers(ctx); |
358 | cgit_print_docstart(ctx); | 359 | cgit_print_docstart(ctx); |
359 | cgit_print_pageheader(ctx); | 360 | cgit_print_pageheader(ctx); |
360 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 361 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
361 | cgit_print_docend(); | 362 | cgit_print_docend(); |
362 | return 1; | 363 | return 1; |
363 | } | 364 | } |
364 | return 0; | 365 | return 0; |
365 | } | 366 | } |
366 | 367 | ||
367 | static void process_request(void *cbdata) | 368 | static void process_request(void *cbdata) |
368 | { | 369 | { |
369 | struct cgit_context *ctx = cbdata; | 370 | struct cgit_context *ctx = cbdata; |
370 | struct cgit_cmd *cmd; | 371 | struct cgit_cmd *cmd; |
371 | 372 | ||
372 | cmd = cgit_get_cmd(ctx); | 373 | cmd = cgit_get_cmd(ctx); |
373 | if (!cmd) { | 374 | if (!cmd) { |
374 | ctx->page.title = "cgit error"; | 375 | ctx->page.title = "cgit error"; |
375 | cgit_print_http_headers(ctx); | 376 | cgit_print_http_headers(ctx); |
376 | cgit_print_docstart(ctx); | 377 | cgit_print_docstart(ctx); |
377 | cgit_print_pageheader(ctx); | 378 | cgit_print_pageheader(ctx); |
378 | cgit_print_error("Invalid request"); | 379 | cgit_print_error("Invalid request"); |
379 | cgit_print_docend(); | 380 | cgit_print_docend(); |
380 | return; | 381 | return; |
381 | } | 382 | } |
382 | 383 | ||
383 | if (cmd->want_repo && !ctx->repo) { | 384 | if (cmd->want_repo && !ctx->repo) { |
384 | cgit_print_http_headers(ctx); | 385 | cgit_print_http_headers(ctx); |
385 | cgit_print_docstart(ctx); | 386 | cgit_print_docstart(ctx); |
386 | cgit_print_pageheader(ctx); | 387 | cgit_print_pageheader(ctx); |
387 | cgit_print_error(fmt("No repository selected")); | 388 | cgit_print_error(fmt("No repository selected")); |
388 | cgit_print_docend(); | 389 | cgit_print_docend(); |
389 | return; | 390 | return; |
390 | } | 391 | } |
391 | 392 | ||
392 | if (ctx->repo && prepare_repo_cmd(ctx)) | 393 | if (ctx->repo && prepare_repo_cmd(ctx)) |
393 | return; | 394 | return; |
394 | 395 | ||
395 | if (cmd->want_layout) { | 396 | if (cmd->want_layout) { |
396 | cgit_print_http_headers(ctx); | 397 | cgit_print_http_headers(ctx); |
397 | cgit_print_docstart(ctx); | 398 | cgit_print_docstart(ctx); |
398 | cgit_print_pageheader(ctx); | 399 | cgit_print_pageheader(ctx); |
399 | } | 400 | } |
400 | 401 | ||
401 | cmd->fn(ctx); | 402 | cmd->fn(ctx); |
402 | 403 | ||
403 | if (cmd->want_layout) | 404 | if (cmd->want_layout) |
404 | cgit_print_docend(); | 405 | cgit_print_docend(); |
405 | } | 406 | } |
406 | 407 | ||
407 | int cmp_repos(const void *a, const void *b) | 408 | int cmp_repos(const void *a, const void *b) |
408 | { | 409 | { |
409 | const struct cgit_repo *ra = a, *rb = b; | 410 | const struct cgit_repo *ra = a, *rb = b; |
410 | return strcmp(ra->url, rb->url); | 411 | return strcmp(ra->url, rb->url); |
411 | } | 412 | } |
412 | 413 | ||
413 | void print_repo(struct cgit_repo *repo) | 414 | void print_repo(struct cgit_repo *repo) |
414 | { | 415 | { |
415 | printf("repo.url=%s\n", repo->url); | 416 | printf("repo.url=%s\n", repo->url); |
416 | printf("repo.name=%s\n", repo->name); | 417 | printf("repo.name=%s\n", repo->name); |
417 | printf("repo.path=%s\n", repo->path); | 418 | printf("repo.path=%s\n", repo->path); |
418 | if (repo->owner) | 419 | if (repo->owner) |
419 | printf("repo.owner=%s\n", repo->owner); | 420 | printf("repo.owner=%s\n", repo->owner); |
420 | if (repo->desc) | 421 | if (repo->desc) |
421 | printf("repo.desc=%s\n", repo->desc); | 422 | printf("repo.desc=%s\n", repo->desc); |
422 | if (repo->readme) | 423 | if (repo->readme) |
423 | printf("repo.readme=%s\n", repo->readme); | 424 | printf("repo.readme=%s\n", repo->readme); |
424 | printf("\n"); | 425 | printf("\n"); |
425 | } | 426 | } |
426 | 427 | ||
427 | void print_repolist(struct cgit_repolist *list) | 428 | void print_repolist(struct cgit_repolist *list) |
428 | { | 429 | { |
429 | int i; | 430 | int i; |
430 | 431 | ||
431 | for(i = 0; i < list->count; i++) | 432 | for(i = 0; i < list->count; i++) |
432 | print_repo(&list->repos[i]); | 433 | print_repo(&list->repos[i]); |
433 | } | 434 | } |
434 | 435 | ||
435 | 436 | ||
436 | static void cgit_parse_args(int argc, const char **argv) | 437 | static void cgit_parse_args(int argc, const char **argv) |
437 | { | 438 | { |
438 | int i; | 439 | int i; |
439 | int scan = 0; | 440 | int scan = 0; |
440 | 441 | ||
441 | for (i = 1; i < argc; i++) { | 442 | for (i = 1; i < argc; i++) { |
442 | if (!strncmp(argv[i], "--cache=", 8)) { | 443 | if (!strncmp(argv[i], "--cache=", 8)) { |
443 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 444 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
444 | } | 445 | } |
445 | if (!strcmp(argv[i], "--nocache")) { | 446 | if (!strcmp(argv[i], "--nocache")) { |
446 | ctx.cfg.nocache = 1; | 447 | ctx.cfg.nocache = 1; |
447 | } | 448 | } |
449 | if (!strcmp(argv[i], "--nohttp")) { | ||
450 | ctx.env.no_http = "1"; | ||
451 | } | ||
448 | if (!strncmp(argv[i], "--query=", 8)) { | 452 | if (!strncmp(argv[i], "--query=", 8)) { |
449 | ctx.qry.raw = xstrdup(argv[i]+8); | 453 | ctx.qry.raw = xstrdup(argv[i]+8); |
450 | } | 454 | } |
451 | if (!strncmp(argv[i], "--repo=", 7)) { | 455 | if (!strncmp(argv[i], "--repo=", 7)) { |
452 | ctx.qry.repo = xstrdup(argv[i]+7); | 456 | ctx.qry.repo = xstrdup(argv[i]+7); |
453 | } | 457 | } |
454 | if (!strncmp(argv[i], "--page=", 7)) { | 458 | if (!strncmp(argv[i], "--page=", 7)) { |
455 | ctx.qry.page = xstrdup(argv[i]+7); | 459 | ctx.qry.page = xstrdup(argv[i]+7); |
456 | } | 460 | } |
457 | if (!strncmp(argv[i], "--head=", 7)) { | 461 | if (!strncmp(argv[i], "--head=", 7)) { |
458 | ctx.qry.head = xstrdup(argv[i]+7); | 462 | ctx.qry.head = xstrdup(argv[i]+7); |
459 | ctx.qry.has_symref = 1; | 463 | ctx.qry.has_symref = 1; |
460 | } | 464 | } |
461 | if (!strncmp(argv[i], "--sha1=", 7)) { | 465 | if (!strncmp(argv[i], "--sha1=", 7)) { |
462 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 466 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
463 | ctx.qry.has_sha1 = 1; | 467 | ctx.qry.has_sha1 = 1; |
464 | } | 468 | } |
465 | if (!strncmp(argv[i], "--ofs=", 6)) { | 469 | if (!strncmp(argv[i], "--ofs=", 6)) { |
466 | ctx.qry.ofs = atoi(argv[i]+6); | 470 | ctx.qry.ofs = atoi(argv[i]+6); |
467 | } | 471 | } |
468 | if (!strncmp(argv[i], "--scan-tree=", 12)) { | 472 | if (!strncmp(argv[i], "--scan-tree=", 12)) { |
469 | scan++; | 473 | scan++; |
470 | scan_tree(argv[i] + 12); | 474 | scan_tree(argv[i] + 12); |
471 | } | 475 | } |
472 | } | 476 | } |
473 | if (scan) { | 477 | if (scan) { |
474 | qsort(cgit_repolist.repos, cgit_repolist.count, | 478 | qsort(cgit_repolist.repos, cgit_repolist.count, |
475 | sizeof(struct cgit_repo), cmp_repos); | 479 | sizeof(struct cgit_repo), cmp_repos); |
476 | print_repolist(&cgit_repolist); | 480 | print_repolist(&cgit_repolist); |
477 | exit(0); | 481 | exit(0); |
478 | } | 482 | } |
479 | } | 483 | } |
480 | 484 | ||
481 | static int calc_ttl() | 485 | static int calc_ttl() |
482 | { | 486 | { |
483 | if (!ctx.repo) | 487 | if (!ctx.repo) |
484 | return ctx.cfg.cache_root_ttl; | 488 | return ctx.cfg.cache_root_ttl; |
485 | 489 | ||
486 | if (!ctx.qry.page) | 490 | if (!ctx.qry.page) |
487 | return ctx.cfg.cache_repo_ttl; | 491 | return ctx.cfg.cache_repo_ttl; |
488 | 492 | ||
489 | if (ctx.qry.has_symref) | 493 | if (ctx.qry.has_symref) |
490 | return ctx.cfg.cache_dynamic_ttl; | 494 | return ctx.cfg.cache_dynamic_ttl; |
491 | 495 | ||
492 | if (ctx.qry.has_sha1) | 496 | if (ctx.qry.has_sha1) |
493 | return ctx.cfg.cache_static_ttl; | 497 | return ctx.cfg.cache_static_ttl; |
494 | 498 | ||
495 | return ctx.cfg.cache_repo_ttl; | 499 | return ctx.cfg.cache_repo_ttl; |
496 | } | 500 | } |
497 | 501 | ||
498 | int main(int argc, const char **argv) | 502 | int main(int argc, const char **argv) |
499 | { | 503 | { |
500 | const char *path; | 504 | const char *path; |
501 | char *qry; | 505 | char *qry; |
502 | int err, ttl; | 506 | int err, ttl; |
503 | 507 | ||
504 | prepare_context(&ctx); | 508 | prepare_context(&ctx); |
505 | cgit_repolist.length = 0; | 509 | cgit_repolist.length = 0; |
506 | cgit_repolist.count = 0; | 510 | cgit_repolist.count = 0; |
507 | cgit_repolist.repos = NULL; | 511 | cgit_repolist.repos = NULL; |
508 | 512 | ||
509 | cgit_parse_args(argc, argv); | 513 | cgit_parse_args(argc, argv); |
510 | parse_configfile(ctx.env.cgit_config, config_cb); | 514 | parse_configfile(ctx.env.cgit_config, config_cb); |
511 | ctx.repo = NULL; | 515 | ctx.repo = NULL; |
512 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 516 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
513 | 517 | ||
514 | /* If virtual-root isn't specified in cgitrc, lets pretend | 518 | /* If virtual-root isn't specified in cgitrc, lets pretend |
515 | * that virtual-root equals SCRIPT_NAME. | 519 | * that virtual-root equals SCRIPT_NAME. |
516 | */ | 520 | */ |
517 | if (!ctx.cfg.virtual_root) | 521 | if (!ctx.cfg.virtual_root) |
518 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 522 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
519 | 523 | ||
520 | /* If no url parameter is specified on the querystring, lets | 524 | /* If no url parameter is specified on the querystring, lets |
521 | * 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 |
522 | * urls without the need for rewriterules in the webserver (as | 526 | * urls without the need for rewriterules in the webserver (as |
523 | * long as PATH_INFO is included in the cache lookup key). | 527 | * long as PATH_INFO is included in the cache lookup key). |
524 | */ | 528 | */ |
525 | path = ctx.env.path_info; | 529 | path = ctx.env.path_info; |
526 | if (!ctx.qry.url && path) { | 530 | if (!ctx.qry.url && path) { |
527 | if (path[0] == '/') | 531 | if (path[0] == '/') |
528 | path++; | 532 | path++; |
529 | ctx.qry.url = xstrdup(path); | 533 | ctx.qry.url = xstrdup(path); |
530 | if (ctx.qry.raw) { | 534 | if (ctx.qry.raw) { |
531 | qry = ctx.qry.raw; | 535 | qry = ctx.qry.raw; |
532 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 536 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
533 | free(qry); | 537 | free(qry); |
534 | } else | 538 | } else |
535 | ctx.qry.raw = ctx.qry.url; | 539 | ctx.qry.raw = ctx.qry.url; |
536 | cgit_parse_url(ctx.qry.url); | 540 | cgit_parse_url(ctx.qry.url); |
537 | } | 541 | } |
538 | 542 | ||
539 | ttl = calc_ttl(); | 543 | ttl = calc_ttl(); |
540 | ctx.page.expires += ttl*60; | 544 | ctx.page.expires += ttl*60; |
541 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) | 545 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
542 | ctx.cfg.nocache = 1; | 546 | ctx.cfg.nocache = 1; |
543 | if (ctx.cfg.nocache) | 547 | if (ctx.cfg.nocache) |
@@ -118,169 +118,170 @@ struct 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 | ||
123 | struct cgit_query { | 123 | struct 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 | ||
145 | struct cgit_config { | 145 | struct 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 | ||
197 | struct cgit_page { | 197 | struct 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 | ||
210 | struct cgit_environment { | 210 | struct cgit_environment { |
211 | char *cgit_config; | 211 | char *cgit_config; |
212 | char *http_host; | 212 | char *http_host; |
213 | char *https; | 213 | char *https; |
214 | char *no_http; | ||
214 | char *path_info; | 215 | char *path_info; |
215 | char *query_string; | 216 | char *query_string; |
216 | char *request_method; | 217 | char *request_method; |
217 | char *script_name; | 218 | char *script_name; |
218 | char *server_name; | 219 | char *server_name; |
219 | char *server_port; | 220 | char *server_port; |
220 | }; | 221 | }; |
221 | 222 | ||
222 | struct cgit_context { | 223 | struct cgit_context { |
223 | struct cgit_environment env; | 224 | struct cgit_environment env; |
224 | struct cgit_query qry; | 225 | struct cgit_query qry; |
225 | struct cgit_config cfg; | 226 | struct cgit_config cfg; |
226 | struct cgit_repo *repo; | 227 | struct cgit_repo *repo; |
227 | struct cgit_page page; | 228 | struct cgit_page page; |
228 | }; | 229 | }; |
229 | 230 | ||
230 | struct cgit_snapshot_format { | 231 | struct cgit_snapshot_format { |
231 | const char *suffix; | 232 | const char *suffix; |
232 | const char *mimetype; | 233 | const char *mimetype; |
233 | write_archive_fn_t write_func; | 234 | write_archive_fn_t write_func; |
234 | int bit; | 235 | int bit; |
235 | }; | 236 | }; |
236 | 237 | ||
237 | extern const char *cgit_version; | 238 | extern const char *cgit_version; |
238 | 239 | ||
239 | extern struct cgit_repolist cgit_repolist; | 240 | extern struct cgit_repolist cgit_repolist; |
240 | extern struct cgit_context ctx; | 241 | extern struct cgit_context ctx; |
241 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 242 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
242 | 243 | ||
243 | extern struct cgit_repo *cgit_add_repo(const char *url); | 244 | extern struct cgit_repo *cgit_add_repo(const char *url); |
244 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 245 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
245 | extern void cgit_repo_config_cb(const char *name, const char *value); | 246 | extern void cgit_repo_config_cb(const char *name, const char *value); |
246 | 247 | ||
247 | extern int chk_zero(int result, char *msg); | 248 | extern int chk_zero(int result, char *msg); |
248 | extern int chk_positive(int result, char *msg); | 249 | extern int chk_positive(int result, char *msg); |
249 | extern int chk_non_negative(int result, char *msg); | 250 | extern int chk_non_negative(int result, char *msg); |
250 | 251 | ||
251 | extern char *trim_end(const char *str, char c); | 252 | extern char *trim_end(const char *str, char c); |
252 | extern char *strlpart(char *txt, int maxlen); | 253 | extern char *strlpart(char *txt, int maxlen); |
253 | extern char *strrpart(char *txt, int maxlen); | 254 | extern char *strrpart(char *txt, int maxlen); |
254 | 255 | ||
255 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 256 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
256 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 257 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
257 | int flags, void *cb_data); | 258 | int flags, void *cb_data); |
258 | 259 | ||
259 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 260 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
260 | 261 | ||
261 | extern int cgit_diff_files(const unsigned char *old_sha1, | 262 | extern int cgit_diff_files(const unsigned char *old_sha1, |
262 | const unsigned char *new_sha1, | 263 | const unsigned char *new_sha1, |
263 | unsigned long *old_size, unsigned long *new_size, | 264 | unsigned long *old_size, unsigned long *new_size, |
264 | int *binary, linediff_fn fn); | 265 | int *binary, linediff_fn fn); |
265 | 266 | ||
266 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 267 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
267 | const unsigned char *new_sha1, | 268 | const unsigned char *new_sha1, |
268 | filepair_fn fn, const char *prefix); | 269 | filepair_fn fn, const char *prefix); |
269 | 270 | ||
270 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 271 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
271 | 272 | ||
272 | extern char *fmt(const char *format,...); | 273 | extern char *fmt(const char *format,...); |
273 | 274 | ||
274 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 275 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
275 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 276 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
276 | extern void cgit_parse_url(const char *url); | 277 | extern void cgit_parse_url(const char *url); |
277 | 278 | ||
278 | extern const char *cgit_repobasename(const char *reponame); | 279 | extern const char *cgit_repobasename(const char *reponame); |
279 | 280 | ||
280 | extern int cgit_parse_snapshots_mask(const char *str); | 281 | extern int cgit_parse_snapshots_mask(const char *str); |
281 | 282 | ||
282 | extern int cgit_open_filter(struct cgit_filter *filter); | 283 | extern int cgit_open_filter(struct cgit_filter *filter); |
283 | extern int cgit_close_filter(struct cgit_filter *filter); | 284 | extern int cgit_close_filter(struct cgit_filter *filter); |
284 | 285 | ||
285 | 286 | ||
286 | #endif /* CGIT_H */ | 287 | #endif /* CGIT_H */ |
diff --git a/ui-shared.c b/ui-shared.c index 538ddda..4175bd8 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -362,193 +362,193 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
362 | html("</a>"); | 362 | html("</a>"); |
363 | } | 363 | } |
364 | 364 | ||
365 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 365 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
366 | char *rev) | 366 | char *rev) |
367 | { | 367 | { |
368 | reporevlink("patch", name, title, class, head, rev, NULL); | 368 | reporevlink("patch", name, title, class, head, rev, NULL); |
369 | } | 369 | } |
370 | 370 | ||
371 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 371 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
372 | char *path) | 372 | char *path) |
373 | { | 373 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 374 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 375 | } |
376 | 376 | ||
377 | void cgit_object_link(struct object *obj) | 377 | void cgit_object_link(struct object *obj) |
378 | { | 378 | { |
379 | char *page, *shortrev, *fullrev, *name; | 379 | char *page, *shortrev, *fullrev, *name; |
380 | 380 | ||
381 | fullrev = sha1_to_hex(obj->sha1); | 381 | fullrev = sha1_to_hex(obj->sha1); |
382 | shortrev = xstrdup(fullrev); | 382 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 383 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 384 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 386 | ctx.qry.head, fullrev); |
387 | return; | 387 | return; |
388 | } else if (obj->type == OBJ_TREE) | 388 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 389 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 390 | else if (obj->type == OBJ_TAG) |
391 | page = "tag"; | 391 | page = "tag"; |
392 | else | 392 | else |
393 | page = "blob"; | 393 | page = "blob"; |
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 394 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 396 | } |
397 | 397 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 398 | void cgit_print_date(time_t secs, char *format, int local_time) |
399 | { | 399 | { |
400 | char buf[64]; | 400 | char buf[64]; |
401 | struct tm *time; | 401 | struct tm *time; |
402 | 402 | ||
403 | if (!secs) | 403 | if (!secs) |
404 | return; | 404 | return; |
405 | if(local_time) | 405 | if(local_time) |
406 | time = localtime(&secs); | 406 | time = localtime(&secs); |
407 | else | 407 | else |
408 | time = gmtime(&secs); | 408 | time = gmtime(&secs); |
409 | strftime(buf, sizeof(buf)-1, format, time); | 409 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 410 | html_txt(buf); |
411 | } | 411 | } |
412 | 412 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 413 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
414 | { | 414 | { |
415 | time_t now, secs; | 415 | time_t now, secs; |
416 | 416 | ||
417 | if (!t) | 417 | if (!t) |
418 | return; | 418 | return; |
419 | time(&now); | 419 | time(&now); |
420 | secs = now - t; | 420 | secs = now - t; |
421 | 421 | ||
422 | if (secs > max_relative && max_relative >= 0) { | 422 | if (secs > max_relative && max_relative >= 0) { |
423 | cgit_print_date(t, format, ctx.cfg.local_time); | 423 | cgit_print_date(t, format, ctx.cfg.local_time); |
424 | return; | 424 | return; |
425 | } | 425 | } |
426 | 426 | ||
427 | if (secs < TM_HOUR * 2) { | 427 | if (secs < TM_HOUR * 2) { |
428 | htmlf("<span class='age-mins'>%.0f min.</span>", | 428 | htmlf("<span class='age-mins'>%.0f min.</span>", |
429 | secs * 1.0 / TM_MIN); | 429 | secs * 1.0 / TM_MIN); |
430 | return; | 430 | return; |
431 | } | 431 | } |
432 | if (secs < TM_DAY * 2) { | 432 | if (secs < TM_DAY * 2) { |
433 | htmlf("<span class='age-hours'>%.0f hours</span>", | 433 | htmlf("<span class='age-hours'>%.0f hours</span>", |
434 | secs * 1.0 / TM_HOUR); | 434 | secs * 1.0 / TM_HOUR); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | if (secs < TM_WEEK * 2) { | 437 | if (secs < TM_WEEK * 2) { |
438 | htmlf("<span class='age-days'>%.0f days</span>", | 438 | htmlf("<span class='age-days'>%.0f days</span>", |
439 | secs * 1.0 / TM_DAY); | 439 | secs * 1.0 / TM_DAY); |
440 | return; | 440 | return; |
441 | } | 441 | } |
442 | if (secs < TM_MONTH * 2) { | 442 | if (secs < TM_MONTH * 2) { |
443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
444 | secs * 1.0 / TM_WEEK); | 444 | secs * 1.0 / TM_WEEK); |
445 | return; | 445 | return; |
446 | } | 446 | } |
447 | if (secs < TM_YEAR * 2) { | 447 | if (secs < TM_YEAR * 2) { |
448 | htmlf("<span class='age-months'>%.0f months</span>", | 448 | htmlf("<span class='age-months'>%.0f months</span>", |
449 | secs * 1.0 / TM_MONTH); | 449 | secs * 1.0 / TM_MONTH); |
450 | return; | 450 | return; |
451 | } | 451 | } |
452 | htmlf("<span class='age-years'>%.0f years</span>", | 452 | htmlf("<span class='age-years'>%.0f years</span>", |
453 | secs * 1.0 / TM_YEAR); | 453 | secs * 1.0 / TM_YEAR); |
454 | } | 454 | } |
455 | 455 | ||
456 | void cgit_print_http_headers(struct cgit_context *ctx) | 456 | void cgit_print_http_headers(struct cgit_context *ctx) |
457 | { | 457 | { |
458 | if (ctx->cfg.embedded) | 458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) |
459 | return; | 459 | return; |
460 | 460 | ||
461 | if (ctx->page.status) | 461 | if (ctx->page.status) |
462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
463 | if (ctx->page.mimetype && ctx->page.charset) | 463 | if (ctx->page.mimetype && ctx->page.charset) |
464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
465 | ctx->page.charset); | 465 | ctx->page.charset); |
466 | else if (ctx->page.mimetype) | 466 | else if (ctx->page.mimetype) |
467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
468 | if (ctx->page.size) | 468 | if (ctx->page.size) |
469 | htmlf("Content-Length: %ld\n", ctx->page.size); | 469 | htmlf("Content-Length: %ld\n", ctx->page.size); |
470 | if (ctx->page.filename) | 470 | if (ctx->page.filename) |
471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
472 | ctx->page.filename); | 472 | ctx->page.filename); |
473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
475 | if (ctx->page.etag) | 475 | if (ctx->page.etag) |
476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | 476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); |
477 | html("\n"); | 477 | html("\n"); |
478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) | 478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) |
479 | exit(0); | 479 | exit(0); |
480 | } | 480 | } |
481 | 481 | ||
482 | void cgit_print_docstart(struct cgit_context *ctx) | 482 | void cgit_print_docstart(struct cgit_context *ctx) |
483 | { | 483 | { |
484 | if (ctx->cfg.embedded) | 484 | if (ctx->cfg.embedded) |
485 | return; | 485 | return; |
486 | 486 | ||
487 | char *host = cgit_hosturl(); | 487 | char *host = cgit_hosturl(); |
488 | html(cgit_doctype); | 488 | html(cgit_doctype); |
489 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 489 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
490 | html("<head>\n"); | 490 | html("<head>\n"); |
491 | html("<title>"); | 491 | html("<title>"); |
492 | html_txt(ctx->page.title); | 492 | html_txt(ctx->page.title); |
493 | html("</title>\n"); | 493 | html("</title>\n"); |
494 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 494 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
495 | if (ctx->cfg.robots && *ctx->cfg.robots) | 495 | if (ctx->cfg.robots && *ctx->cfg.robots) |
496 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 496 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
497 | html("<link rel='stylesheet' type='text/css' href='"); | 497 | html("<link rel='stylesheet' type='text/css' href='"); |
498 | html_attr(ctx->cfg.css); | 498 | html_attr(ctx->cfg.css); |
499 | html("'/>\n"); | 499 | html("'/>\n"); |
500 | if (ctx->cfg.favicon) { | 500 | if (ctx->cfg.favicon) { |
501 | html("<link rel='shortcut icon' href='"); | 501 | html("<link rel='shortcut icon' href='"); |
502 | html_attr(ctx->cfg.favicon); | 502 | html_attr(ctx->cfg.favicon); |
503 | html("'/>\n"); | 503 | html("'/>\n"); |
504 | } | 504 | } |
505 | if (host && ctx->repo) { | 505 | if (host && ctx->repo) { |
506 | html("<link rel='alternate' title='Atom feed' href='"); | 506 | html("<link rel='alternate' title='Atom feed' href='"); |
507 | html(cgit_httpscheme()); | 507 | html(cgit_httpscheme()); |
508 | html_attr(cgit_hosturl()); | 508 | html_attr(cgit_hosturl()); |
509 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 509 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
510 | fmt("h=%s", ctx->qry.head))); | 510 | fmt("h=%s", ctx->qry.head))); |
511 | html("' type='application/atom+xml'/>\n"); | 511 | html("' type='application/atom+xml'/>\n"); |
512 | } | 512 | } |
513 | if (ctx->cfg.head_include) | 513 | if (ctx->cfg.head_include) |
514 | html_include(ctx->cfg.head_include); | 514 | html_include(ctx->cfg.head_include); |
515 | html("</head>\n"); | 515 | html("</head>\n"); |
516 | html("<body>\n"); | 516 | html("<body>\n"); |
517 | if (ctx->cfg.header) | 517 | if (ctx->cfg.header) |
518 | html_include(ctx->cfg.header); | 518 | html_include(ctx->cfg.header); |
519 | } | 519 | } |
520 | 520 | ||
521 | void cgit_print_docend() | 521 | void cgit_print_docend() |
522 | { | 522 | { |
523 | html("</div>"); | 523 | html("</div>"); |
524 | if (ctx.cfg.footer) | 524 | if (ctx.cfg.footer) |
525 | html_include(ctx.cfg.footer); | 525 | html_include(ctx.cfg.footer); |
526 | else { | 526 | else { |
527 | htmlf("<div class='footer'>generated by cgit %s at ", | 527 | htmlf("<div class='footer'>generated by cgit %s at ", |
528 | cgit_version); | 528 | cgit_version); |
529 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 529 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
530 | html("</div>\n"); | 530 | html("</div>\n"); |
531 | } | 531 | } |
532 | html("</div>"); | 532 | html("</div>"); |
533 | if (ctx.cfg.embedded) | 533 | if (ctx.cfg.embedded) |
534 | return; | 534 | return; |
535 | html("</body>\n</html>\n"); | 535 | html("</body>\n</html>\n"); |
536 | } | 536 | } |
537 | 537 | ||
538 | int print_branch_option(const char *refname, const unsigned char *sha1, | 538 | int print_branch_option(const char *refname, const unsigned char *sha1, |
539 | int flags, void *cb_data) | 539 | int flags, void *cb_data) |
540 | { | 540 | { |
541 | char *name = (char *)refname; | 541 | char *name = (char *)refname; |
542 | html_option(name, name, ctx.qry.head); | 542 | html_option(name, name, ctx.qry.head); |
543 | return 0; | 543 | return 0; |
544 | } | 544 | } |
545 | 545 | ||
546 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 546 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
547 | int flags, void *cb_data) | 547 | int flags, void *cb_data) |
548 | { | 548 | { |
549 | struct tag *tag; | 549 | struct tag *tag; |
550 | struct taginfo *info; | 550 | struct taginfo *info; |
551 | struct object *obj; | 551 | struct object *obj; |
552 | char buf[256], *url; | 552 | char buf[256], *url; |
553 | unsigned char fileid[20]; | 553 | unsigned char fileid[20]; |
554 | int *header = (int *)cb_data; | 554 | int *header = (int *)cb_data; |