summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cache.c4
-rw-r--r--ui-plain.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/cache.c b/cache.c
index 57068a1..d7a8d5a 100644
--- a/cache.c
+++ b/cache.c
@@ -371,69 +371,69 @@ char *sprintftime(const char *format, time_t time)
371 if (!time) 371 if (!time)
372 return NULL; 372 return NULL;
373 tm = gmtime(&time); 373 tm = gmtime(&time);
374 strftime(buf, sizeof(buf)-1, format, tm); 374 strftime(buf, sizeof(buf)-1, format, tm);
375 return buf; 375 return buf;
376} 376}
377 377
378int cache_ls(const char *path) 378int cache_ls(const char *path)
379{ 379{
380 DIR *dir; 380 DIR *dir;
381 struct dirent *ent; 381 struct dirent *ent;
382 int err = 0; 382 int err = 0;
383 struct cache_slot slot; 383 struct cache_slot slot;
384 char fullname[1024]; 384 char fullname[1024];
385 char *name; 385 char *name;
386 386
387 if (!path) { 387 if (!path) {
388 cache_log("[cgit] cache path not specified\n"); 388 cache_log("[cgit] cache path not specified\n");
389 return -1; 389 return -1;
390 } 390 }
391 if (strlen(path) > 1024 - 10) { 391 if (strlen(path) > 1024 - 10) {
392 cache_log("[cgit] cache path too long: %s\n", 392 cache_log("[cgit] cache path too long: %s\n",
393 path); 393 path);
394 return -1; 394 return -1;
395 } 395 }
396 dir = opendir(path); 396 dir = opendir(path);
397 if (!dir) { 397 if (!dir) {
398 err = errno; 398 err = errno;
399 cache_log("[cgit] unable to open path %s: %s (%d)\n", 399 cache_log("[cgit] unable to open path %s: %s (%d)\n",
400 path, strerror(err), err); 400 path, strerror(err), err);
401 return err; 401 return err;
402 } 402 }
403 strcpy(fullname, path); 403 strcpy(fullname, path);
404 name = fullname + strlen(path); 404 name = fullname + strlen(path);
405 if (*(name - 1) != '/') { 405 if (*(name - 1) != '/') {
406 *name++ = '/'; 406 *name++ = '/';
407 *name = '\0'; 407 *name = '\0';
408 } 408 }
409 slot.cache_name = fullname; 409 slot.cache_name = fullname;
410 while((ent = readdir(dir)) != NULL) { 410 while((ent = readdir(dir)) != NULL) {
411 if (strlen(ent->d_name) != 8) 411 if (strlen(ent->d_name) != 8)
412 continue; 412 continue;
413 strcpy(name, ent->d_name); 413 strcpy(name, ent->d_name);
414 if ((err = open_slot(&slot)) != 0) { 414 if ((err = open_slot(&slot)) != 0) {
415 cache_log("[cgit] unable to open path %s: %s (%d)\n", 415 cache_log("[cgit] unable to open path %s: %s (%d)\n",
416 fullname, strerror(err), err); 416 fullname, strerror(err), err);
417 continue; 417 continue;
418 } 418 }
419 printf("%s %s %10zd %s\n", 419 printf("%s %s %10"PRIuMAX" %s\n",
420 name, 420 name,
421 sprintftime("%Y-%m-%d %H:%M:%S", 421 sprintftime("%Y-%m-%d %H:%M:%S",
422 slot.cache_st.st_mtime), 422 slot.cache_st.st_mtime),
423 slot.cache_st.st_size, 423 (uintmax_t)slot.cache_st.st_size,
424 slot.buf); 424 slot.buf);
425 close_slot(&slot); 425 close_slot(&slot);
426 } 426 }
427 closedir(dir); 427 closedir(dir);
428 return 0; 428 return 0;
429} 429}
430 430
431/* Print a message to stdout */ 431/* Print a message to stdout */
432void cache_log(const char *format, ...) 432void cache_log(const char *format, ...)
433{ 433{
434 va_list args; 434 va_list args;
435 va_start(args, format); 435 va_start(args, format);
436 vfprintf(stderr, format, args); 436 vfprintf(stderr, format, args);
437 va_end(args); 437 va_end(args);
438} 438}
439 439
diff --git a/ui-plain.c b/ui-plain.c
index be559e0..5addd9e 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,69 +1,69 @@
1/* ui-plain.c: functions for output of plain blobs by path 1/* ui-plain.c: functions for output of plain blobs by path
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 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 "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13char *curr_rev; 13char *curr_rev;
14char *match_path; 14char *match_path;
15int match; 15int match;
16 16
17static void print_object(const unsigned char *sha1, const char *path) 17static void print_object(const unsigned char *sha1, const char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf;
21 size_t size; 21 unsigned long size;
22 22
23 type = sha1_object_info(sha1, &size); 23 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
26 return; 26 return;
27 } 27 }
28 28
29 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 30 if (!buf) {
31 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
33 } 33 }
34 ctx.page.mimetype = "text/plain"; 34 ctx.page.mimetype = "text/plain";
35 ctx.page.filename = fmt("%s", path); 35 ctx.page.filename = fmt("%s", path);
36 ctx.page.size = size; 36 ctx.page.size = size;
37 cgit_print_http_headers(&ctx); 37 cgit_print_http_headers(&ctx);
38 html_raw(buf, size); 38 html_raw(buf, size);
39 match = 1; 39 match = 1;
40} 40}
41 41
42static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 42static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
43 const char *pathname, unsigned mode, int stage, 43 const char *pathname, unsigned mode, int stage,
44 void *cbdata) 44 void *cbdata)
45{ 45{
46 if (S_ISDIR(mode)) 46 if (S_ISDIR(mode))
47 return READ_TREE_RECURSIVE; 47 return READ_TREE_RECURSIVE;
48 48
49 if (S_ISREG(mode)) 49 if (S_ISREG(mode))
50 print_object(sha1, pathname); 50 print_object(sha1, pathname);
51 51
52 return 0; 52 return 0;
53} 53}
54 54
55void cgit_print_plain(struct cgit_context *ctx) 55void cgit_print_plain(struct cgit_context *ctx)
56{ 56{
57 const char *rev = ctx->qry.sha1; 57 const char *rev = ctx->qry.sha1;
58 unsigned char sha1[20]; 58 unsigned char sha1[20];
59 struct commit *commit; 59 struct commit *commit;
60 const char *paths[] = {ctx->qry.path, NULL}; 60 const char *paths[] = {ctx->qry.path, NULL};
61 61
62 if (!rev) 62 if (!rev)
63 rev = ctx->qry.head; 63 rev = ctx->qry.head;
64 64
65 curr_rev = xstrdup(rev); 65 curr_rev = xstrdup(rev);
66 if (get_sha1(rev, sha1)) { 66 if (get_sha1(rev, sha1)) {
67 html_status(404, "Not found", 0); 67 html_status(404, "Not found", 0);
68 return; 68 return;
69 } 69 }