|
diff --git a/cache.c b/cache.c index e590d7b..b701e13 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -327,16 +327,84 @@ int cache_process(int size, const char *path, const char *key, int ttl, |
327 | slot.ttl = ttl; |
327 | slot.ttl = ttl; |
328 | slot.cache_name = filename; |
328 | slot.cache_name = filename; |
329 | slot.lock_name = lockname; |
329 | slot.lock_name = lockname; |
330 | slot.key = key; |
330 | slot.key = key; |
331 | slot.keylen = strlen(key); |
331 | slot.keylen = strlen(key); |
332 | return process_slot(&slot); |
332 | return process_slot(&slot); |
333 | } |
333 | } |
334 | |
334 | |
| |
335 | /* Return a strftime formatted date/time |
| |
336 | * NB: the result from this function is to shared memory |
| |
337 | */ |
| |
338 | char *sprintftime(const char *format, time_t time) |
| |
339 | { |
| |
340 | static char buf[64]; |
| |
341 | struct tm *tm; |
| |
342 | |
| |
343 | if (!time) |
| |
344 | return NULL; |
| |
345 | tm = gmtime(&time); |
| |
346 | strftime(buf, sizeof(buf)-1, format, tm); |
| |
347 | return buf; |
| |
348 | } |
| |
349 | |
| |
350 | int cache_ls(const char *path) |
| |
351 | { |
| |
352 | DIR *dir; |
| |
353 | struct dirent *ent; |
| |
354 | int err = 0; |
| |
355 | struct cache_slot slot; |
| |
356 | char fullname[1024]; |
| |
357 | char *name; |
| |
358 | |
| |
359 | if (!path) { |
| |
360 | cache_log("[cgit] cache path not specified\n"); |
| |
361 | return -1; |
| |
362 | } |
| |
363 | if (strlen(path) > 1024 - 10) { |
| |
364 | cache_log("[cgit] cache path too long: %s\n", |
| |
365 | path); |
| |
366 | return -1; |
| |
367 | } |
| |
368 | dir = opendir(path); |
| |
369 | if (!dir) { |
| |
370 | err = errno; |
| |
371 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
| |
372 | path, strerror(err), err); |
| |
373 | return err; |
| |
374 | } |
| |
375 | strcpy(fullname, path); |
| |
376 | name = fullname + strlen(path); |
| |
377 | if (*(name - 1) != '/') { |
| |
378 | *name++ = '/'; |
| |
379 | *name = '\0'; |
| |
380 | } |
| |
381 | slot.cache_name = fullname; |
| |
382 | while((ent = readdir(dir)) != NULL) { |
| |
383 | if (strlen(ent->d_name) != 8) |
| |
384 | continue; |
| |
385 | strcpy(name, ent->d_name); |
| |
386 | if ((err = open_slot(&slot)) != 0) { |
| |
387 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
| |
388 | fullname, strerror(err), err); |
| |
389 | continue; |
| |
390 | } |
| |
391 | printf("%s %s %10lld %s\n", |
| |
392 | name, |
| |
393 | sprintftime("%Y-%m-%d %H:%M:%S", |
| |
394 | slot.cache_st.st_mtime), |
| |
395 | slot.cache_st.st_size, |
| |
396 | slot.buf); |
| |
397 | close_slot(&slot); |
| |
398 | } |
| |
399 | closedir(dir); |
| |
400 | return 0; |
| |
401 | } |
| |
402 | |
335 | /* Print a message to stdout */ |
403 | /* Print a message to stdout */ |
336 | void cache_log(const char *format, ...) |
404 | void cache_log(const char *format, ...) |
337 | { |
405 | { |
338 | va_list args; |
406 | va_list args; |
339 | va_start(args, format); |
407 | va_start(args, format); |
340 | vfprintf(stderr, format, args); |
408 | vfprintf(stderr, format, args); |
341 | va_end(args); |
409 | va_end(args); |
342 | } |
410 | } |
|
|
diff --git a/cache.h b/cache.h index 5f2178d..66cc41f 100644 --- a/ cache.h+++ b/ cache.h |
|
@@ -21,12 +21,15 @@ typedef void (*cache_fill_fn)(void *cbdata); |
21 | * |
21 | * |
22 | * Return value |
22 | * Return value |
23 | * 0 indicates success, everyting else is an error |
23 | * 0 indicates success, everyting else is an error |
24 | */ |
24 | */ |
25 | extern int cache_process(int size, const char *path, const char *key, int ttl, |
25 | extern int cache_process(int size, const char *path, const char *key, int ttl, |
26 | cache_fill_fn fn, void *cbdata); |
26 | cache_fill_fn fn, void *cbdata); |
27 | |
27 | |
28 | |
28 | |
| |
29 | /* List info about all cache entries on stdout */ |
| |
30 | extern int cache_ls(const char *path); |
| |
31 | |
29 | /* Print a message to stdout */ |
32 | /* Print a message to stdout */ |
30 | extern void cache_log(const char *format, ...); |
33 | extern void cache_log(const char *format, ...); |
31 | |
34 | |
32 | #endif /* CGIT_CACHE_H */ |
35 | #endif /* CGIT_CACHE_H */ |
|
|
diff --git a/cmd.c b/cmd.c index e0eacbe..07f4707 100644 --- a/ cmd.c+++ b/ cmd.c |
|
@@ -3,16 +3,18 @@ |
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 "cmd.h" |
10 | #include "cmd.h" |
| |
11 | #include "cache.h" |
| |
12 | #include "ui-shared.h" |
11 | #include "ui-blob.h" |
13 | #include "ui-blob.h" |
12 | #include "ui-commit.h" |
14 | #include "ui-commit.h" |
13 | #include "ui-diff.h" |
15 | #include "ui-diff.h" |
14 | #include "ui-log.h" |
16 | #include "ui-log.h" |
15 | #include "ui-patch.h" |
17 | #include "ui-patch.h" |
16 | #include "ui-refs.h" |
18 | #include "ui-refs.h" |
17 | #include "ui-repolist.h" |
19 | #include "ui-repolist.h" |
18 | #include "ui-snapshot.h" |
20 | #include "ui-snapshot.h" |
@@ -30,27 +32,35 @@ static void commit_fn(struct cgit_context *ctx) |
30 | cgit_print_commit(ctx->qry.sha1); |
32 | cgit_print_commit(ctx->qry.sha1); |
31 | } |
33 | } |
32 | |
34 | |
33 | static void diff_fn(struct cgit_context *ctx) |
35 | static void diff_fn(struct cgit_context *ctx) |
34 | { |
36 | { |
35 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
37 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
36 | } |
38 | } |
37 | |
39 | |
38 | static void repolist_fn(struct cgit_context *ctx) |
| |
39 | { |
| |
40 | cgit_print_repolist(); |
| |
41 | } |
| |
42 | |
| |
43 | static void log_fn(struct cgit_context *ctx) |
40 | static void log_fn(struct cgit_context *ctx) |
44 | { |
41 | { |
45 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
42 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
46 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
43 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
47 | } |
44 | } |
48 | |
45 | |
| |
46 | static void ls_cache_fn(struct cgit_context *ctx) |
| |
47 | { |
| |
48 | ctx->page.mimetype = "text/plain"; |
| |
49 | ctx->page.filename = "ls-cache.txt"; |
| |
50 | cgit_print_http_headers(ctx); |
| |
51 | cache_ls(ctx->cfg.cache_root); |
| |
52 | } |
| |
53 | |
| |
54 | static void repolist_fn(struct cgit_context *ctx) |
| |
55 | { |
| |
56 | cgit_print_repolist(); |
| |
57 | } |
| |
58 | |
49 | static void patch_fn(struct cgit_context *ctx) |
59 | static void patch_fn(struct cgit_context *ctx) |
50 | { |
60 | { |
51 | cgit_print_patch(ctx->qry.sha1); |
61 | cgit_print_patch(ctx->qry.sha1); |
52 | } |
62 | } |
53 | |
63 | |
54 | static void refs_fn(struct cgit_context *ctx) |
64 | static void refs_fn(struct cgit_context *ctx) |
55 | { |
65 | { |
56 | cgit_print_refs(); |
66 | cgit_print_refs(); |
@@ -83,16 +93,17 @@ static void tree_fn(struct cgit_context *ctx) |
83 | |
93 | |
84 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
94 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
85 | { |
95 | { |
86 | static struct cgit_cmd cmds[] = { |
96 | static struct cgit_cmd cmds[] = { |
87 | def_cmd(blob, 1, 0), |
97 | def_cmd(blob, 1, 0), |
88 | def_cmd(commit, 1, 1), |
98 | def_cmd(commit, 1, 1), |
89 | def_cmd(diff, 1, 1), |
99 | def_cmd(diff, 1, 1), |
90 | def_cmd(log, 1, 1), |
100 | def_cmd(log, 1, 1), |
| |
101 | def_cmd(ls_cache, 0, 0), |
91 | def_cmd(patch, 1, 0), |
102 | def_cmd(patch, 1, 0), |
92 | def_cmd(refs, 1, 1), |
103 | def_cmd(refs, 1, 1), |
93 | def_cmd(repolist, 0, 0), |
104 | def_cmd(repolist, 0, 0), |
94 | def_cmd(snapshot, 1, 0), |
105 | def_cmd(snapshot, 1, 0), |
95 | def_cmd(summary, 1, 1), |
106 | def_cmd(summary, 1, 1), |
96 | def_cmd(tag, 1, 1), |
107 | def_cmd(tag, 1, 1), |
97 | def_cmd(tree, 1, 1), |
108 | def_cmd(tree, 1, 1), |
98 | }; |
109 | }; |
|