author | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:55:58 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:55:58 (UTC) |
commit | 7c849d94ec1cfecdec5a88d49f5af5c98f96ebca (patch) (unidiff) | |
tree | 294acaa3368cba880dcc74aac8fb95e22156be21 /cgit.c | |
parent | 61245ad18545ab09b22e9fcce5e49d5d36bf8176 (diff) | |
download | cgit-7c849d94ec1cfecdec5a88d49f5af5c98f96ebca.zip cgit-7c849d94ec1cfecdec5a88d49f5af5c98f96ebca.tar.gz cgit-7c849d94ec1cfecdec5a88d49f5af5c98f96ebca.tar.bz2 |
Allow relative paths for cgit_cache_root
Make sure we chdir(2) back to the original getcwd(2) when a page
has been generated. Also, if the cgit_cache_root do not exist,
try to create it.
This is a feature intended to ease testing/debugging.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -29,38 +29,42 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
29 | if (!cgit_query_page) { | 29 | if (!cgit_query_page) { |
30 | cgit_print_summary(); | 30 | cgit_print_summary(); |
31 | } else if (!strcmp(cgit_query_page, "log")) { | 31 | } else if (!strcmp(cgit_query_page, "log")) { |
32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); | 32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); |
33 | } else if (!strcmp(cgit_query_page, "tree")) { | 33 | } else if (!strcmp(cgit_query_page, "tree")) { |
34 | cgit_print_tree(cgit_query_sha1); | 34 | cgit_print_tree(cgit_query_sha1); |
35 | } else if (!strcmp(cgit_query_page, "commit")) { | 35 | } else if (!strcmp(cgit_query_page, "commit")) { |
36 | cgit_print_commit(cgit_query_sha1); | 36 | cgit_print_commit(cgit_query_sha1); |
37 | } else if (!strcmp(cgit_query_page, "view")) { | 37 | } else if (!strcmp(cgit_query_page, "view")) { |
38 | cgit_print_view(cgit_query_sha1); | 38 | cgit_print_view(cgit_query_sha1); |
39 | } | 39 | } |
40 | cgit_print_docend(); | 40 | cgit_print_docend(); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void cgit_fill_cache(struct cacheitem *item) | 43 | static void cgit_fill_cache(struct cacheitem *item) |
44 | { | 44 | { |
45 | static char buf[PATH_MAX]; | ||
46 | |||
47 | getcwd(buf, sizeof(buf)); | ||
45 | htmlfd = item->fd; | 48 | htmlfd = item->fd; |
46 | item->st.st_mtime = time(NULL); | 49 | item->st.st_mtime = time(NULL); |
47 | if (cgit_query_repo) | 50 | if (cgit_query_repo) |
48 | cgit_print_repo_page(item); | 51 | cgit_print_repo_page(item); |
49 | else | 52 | else |
50 | cgit_print_repolist(item); | 53 | cgit_print_repolist(item); |
54 | chdir(buf); | ||
51 | } | 55 | } |
52 | 56 | ||
53 | static void cgit_check_cache(struct cacheitem *item) | 57 | static void cgit_check_cache(struct cacheitem *item) |
54 | { | 58 | { |
55 | int i = 0; | 59 | int i = 0; |
56 | 60 | ||
57 | cache_prepare(item); | 61 | cache_prepare(item); |
58 | top: | 62 | top: |
59 | if (++i > cgit_max_lock_attempts) { | 63 | if (++i > cgit_max_lock_attempts) { |
60 | die("cgit_refresh_cache: unable to lock %s: %s", | 64 | die("cgit_refresh_cache: unable to lock %s: %s", |
61 | item->name, strerror(errno)); | 65 | item->name, strerror(errno)); |
62 | } | 66 | } |
63 | if (!cache_exist(item)) { | 67 | if (!cache_exist(item)) { |
64 | if (!cache_lock(item)) { | 68 | if (!cache_lock(item)) { |
65 | sleep(1); | 69 | sleep(1); |
66 | goto top; | 70 | goto top; |