|
diff --git a/cgit.c b/cgit.c index a3a04d9..9535abc 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -11,97 +11,97 @@ |
11 | const char cgit_version[] = CGIT_VERSION; |
11 | const char cgit_version[] = CGIT_VERSION; |
12 | |
12 | |
13 | static void cgit_prepare_cache(struct cacheitem *item) |
13 | static void cgit_prepare_cache(struct cacheitem *item) |
14 | { |
14 | { |
15 | if (!cgit_query_repo) { |
15 | if (!cgit_query_repo) { |
16 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
16 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
17 | item->ttl = cgit_cache_root_ttl; |
17 | item->ttl = cgit_cache_root_ttl; |
18 | } else if (!cgit_query_page) { |
18 | } else if (!cgit_query_page) { |
19 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
19 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
20 | cgit_query_repo)); |
20 | cgit_query_repo)); |
21 | item->ttl = cgit_cache_repo_ttl; |
21 | item->ttl = cgit_cache_repo_ttl; |
22 | } else { |
22 | } else { |
23 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
23 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
24 | cgit_query_repo, cgit_query_page, |
24 | cgit_query_repo, cgit_query_page, |
25 | cache_safe_filename(cgit_querystring))); |
25 | cache_safe_filename(cgit_querystring))); |
26 | if (cgit_query_has_symref) |
26 | if (cgit_query_has_symref) |
27 | item->ttl = cgit_cache_dynamic_ttl; |
27 | item->ttl = cgit_cache_dynamic_ttl; |
28 | else if (cgit_query_has_sha1) |
28 | else if (cgit_query_has_sha1) |
29 | item->ttl = cgit_cache_static_ttl; |
29 | item->ttl = cgit_cache_static_ttl; |
30 | else |
30 | else |
31 | item->ttl = cgit_cache_repo_ttl; |
31 | item->ttl = cgit_cache_repo_ttl; |
32 | } |
32 | } |
33 | } |
33 | } |
34 | |
34 | |
35 | static void cgit_print_repo_page(struct cacheitem *item) |
35 | static void cgit_print_repo_page(struct cacheitem *item) |
36 | { |
36 | { |
37 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
37 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
38 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
38 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
39 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
39 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
40 | cgit_print_docstart(title, item); |
40 | cgit_print_docstart(title, item); |
41 | cgit_print_pageheader(title, 0); |
41 | cgit_print_pageheader(title, 0); |
42 | cgit_print_error(fmt("Unable to scan repository: %s", |
42 | cgit_print_error(fmt("Unable to scan repository: %s", |
43 | strerror(errno))); |
43 | strerror(errno))); |
44 | cgit_print_docend(); |
44 | cgit_print_docend(); |
45 | return; |
45 | return; |
46 | } |
46 | } |
47 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
47 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
48 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
48 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
49 | int show_search = 0; |
49 | int show_search = 0; |
50 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) |
50 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) |
51 | show_search = 1; |
51 | show_search = 1; |
52 | cgit_print_docstart(title, item); |
52 | cgit_print_docstart(title, item); |
53 | cgit_print_pageheader(title, show_search); |
53 | cgit_print_pageheader(title, show_search); |
54 | if (!cgit_query_page) { |
54 | if (!cgit_query_page) { |
55 | cgit_print_summary(); |
55 | cgit_print_summary(); |
56 | } else if (!strcmp(cgit_query_page, "log")) { |
56 | } else if (!strcmp(cgit_query_page, "log")) { |
57 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search); |
57 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search); |
58 | } else if (!strcmp(cgit_query_page, "tree")) { |
58 | } else if (!strcmp(cgit_query_page, "tree")) { |
59 | cgit_print_tree(cgit_query_sha1); |
59 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
60 | } else if (!strcmp(cgit_query_page, "commit")) { |
60 | } else if (!strcmp(cgit_query_page, "commit")) { |
61 | cgit_print_commit(cgit_query_sha1); |
61 | cgit_print_commit(cgit_query_sha1); |
62 | } else if (!strcmp(cgit_query_page, "view")) { |
62 | } else if (!strcmp(cgit_query_page, "view")) { |
63 | cgit_print_view(cgit_query_sha1); |
63 | cgit_print_view(cgit_query_sha1); |
64 | } else if (!strcmp(cgit_query_page, "diff")) { |
64 | } else if (!strcmp(cgit_query_page, "diff")) { |
65 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
65 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
66 | } |
66 | } |
67 | cgit_print_docend(); |
67 | cgit_print_docend(); |
68 | } |
68 | } |
69 | |
69 | |
70 | static void cgit_fill_cache(struct cacheitem *item) |
70 | static void cgit_fill_cache(struct cacheitem *item) |
71 | { |
71 | { |
72 | static char buf[PATH_MAX]; |
72 | static char buf[PATH_MAX]; |
73 | |
73 | |
74 | getcwd(buf, sizeof(buf)); |
74 | getcwd(buf, sizeof(buf)); |
75 | htmlfd = item->fd; |
75 | htmlfd = item->fd; |
76 | item->st.st_mtime = time(NULL); |
76 | item->st.st_mtime = time(NULL); |
77 | if (cgit_query_repo) |
77 | if (cgit_query_repo) |
78 | cgit_print_repo_page(item); |
78 | cgit_print_repo_page(item); |
79 | else |
79 | else |
80 | cgit_print_repolist(item); |
80 | cgit_print_repolist(item); |
81 | chdir(buf); |
81 | chdir(buf); |
82 | } |
82 | } |
83 | |
83 | |
84 | static void cgit_check_cache(struct cacheitem *item) |
84 | static void cgit_check_cache(struct cacheitem *item) |
85 | { |
85 | { |
86 | int i = 0; |
86 | int i = 0; |
87 | |
87 | |
88 | top: |
88 | top: |
89 | if (++i > cgit_max_lock_attempts) { |
89 | if (++i > cgit_max_lock_attempts) { |
90 | die("cgit_refresh_cache: unable to lock %s: %s", |
90 | die("cgit_refresh_cache: unable to lock %s: %s", |
91 | item->name, strerror(errno)); |
91 | item->name, strerror(errno)); |
92 | } |
92 | } |
93 | if (!cache_exist(item)) { |
93 | if (!cache_exist(item)) { |
94 | if (!cache_lock(item)) { |
94 | if (!cache_lock(item)) { |
95 | sleep(1); |
95 | sleep(1); |
96 | goto top; |
96 | goto top; |
97 | } |
97 | } |
98 | if (!cache_exist(item)) { |
98 | if (!cache_exist(item)) { |
99 | cgit_fill_cache(item); |
99 | cgit_fill_cache(item); |
100 | cache_unlock(item); |
100 | cache_unlock(item); |
101 | } else { |
101 | } else { |
102 | cache_cancel_lock(item); |
102 | cache_cancel_lock(item); |
103 | } |
103 | } |
104 | } else if (cache_expired(item) && cache_lock(item)) { |
104 | } else if (cache_expired(item) && cache_lock(item)) { |
105 | if (cache_expired(item)) { |
105 | if (cache_expired(item)) { |
106 | cgit_fill_cache(item); |
106 | cgit_fill_cache(item); |
107 | cache_unlock(item); |
107 | cache_unlock(item); |
|