author | Michael Krelin <hacker@klever.net> | 2007-07-21 16:00:53 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-21 16:00:53 (UTC) |
commit | dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e (patch) (unidiff) | |
tree | e42607f85bfb3ca33dff761a3966c502cdd6868e /cgit.c | |
parent | 97c025ae8ecf9764fd6996c81c51c3de4adb837c (diff) | |
download | cgit-dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e.zip cgit-dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e.tar.gz cgit-dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e.tar.bz2 |
allow selective enabling of snapshots
snapshot configuration parameter now can be a
space/slash/comma/colon/semicolon/pipe-separated list of snaphot suffixes as
listed in ui-snapshot.c
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,169 +1,170 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | 10 | ||
11 | static int cgit_prepare_cache(struct cacheitem *item) | 11 | static int cgit_prepare_cache(struct cacheitem *item) |
12 | { | 12 | { |
13 | if (!cgit_repo && cgit_query_repo) { | 13 | if (!cgit_repo && cgit_query_repo) { |
14 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 14 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
15 | cgit_print_docstart(title, item); | 15 | cgit_print_docstart(title, item); |
16 | cgit_print_pageheader(title, 0); | 16 | cgit_print_pageheader(title, 0); |
17 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); | 17 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); |
18 | cgit_print_docend(); | 18 | cgit_print_docend(); |
19 | return 0; | 19 | return 0; |
20 | } | 20 | } |
21 | 21 | ||
22 | if (!cgit_repo) { | 22 | if (!cgit_repo) { |
23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 23 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
24 | item->ttl = cgit_cache_root_ttl; | 24 | item->ttl = cgit_cache_root_ttl; |
25 | return 1; | 25 | return 1; |
26 | } | 26 | } |
27 | 27 | ||
28 | if (!cgit_cmd) { | 28 | if (!cgit_cmd) { |
29 | item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, | 29 | item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root, |
30 | cache_safe_filename(cgit_repo->url), | 30 | cache_safe_filename(cgit_repo->url), |
31 | cache_safe_filename(cgit_querystring))); | 31 | cache_safe_filename(cgit_querystring))); |
32 | item->ttl = cgit_cache_repo_ttl; | 32 | item->ttl = cgit_cache_repo_ttl; |
33 | } else { | 33 | } else { |
34 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 34 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
35 | cache_safe_filename(cgit_repo->url), | 35 | cache_safe_filename(cgit_repo->url), |
36 | cgit_query_page, | 36 | cgit_query_page, |
37 | cache_safe_filename(cgit_querystring))); | 37 | cache_safe_filename(cgit_querystring))); |
38 | if (cgit_query_has_symref) | 38 | if (cgit_query_has_symref) |
39 | item->ttl = cgit_cache_dynamic_ttl; | 39 | item->ttl = cgit_cache_dynamic_ttl; |
40 | else if (cgit_query_has_sha1) | 40 | else if (cgit_query_has_sha1) |
41 | item->ttl = cgit_cache_static_ttl; | 41 | item->ttl = cgit_cache_static_ttl; |
42 | else | 42 | else |
43 | item->ttl = cgit_cache_repo_ttl; | 43 | item->ttl = cgit_cache_repo_ttl; |
44 | } | 44 | } |
45 | return 1; | 45 | return 1; |
46 | } | 46 | } |
47 | 47 | ||
48 | static void cgit_print_repo_page(struct cacheitem *item) | 48 | static void cgit_print_repo_page(struct cacheitem *item) |
49 | { | 49 | { |
50 | char *title; | 50 | char *title; |
51 | int show_search; | 51 | int show_search; |
52 | 52 | ||
53 | if (!cgit_query_head) | 53 | if (!cgit_query_head) |
54 | cgit_query_head = cgit_repo->defbranch; | 54 | cgit_query_head = cgit_repo->defbranch; |
55 | 55 | ||
56 | if (chdir(cgit_repo->path)) { | 56 | if (chdir(cgit_repo->path)) { |
57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); | 57 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
58 | cgit_print_docstart(title, item); | 58 | cgit_print_docstart(title, item); |
59 | cgit_print_pageheader(title, 0); | 59 | cgit_print_pageheader(title, 0); |
60 | cgit_print_error(fmt("Unable to scan repository: %s", | 60 | cgit_print_error(fmt("Unable to scan repository: %s", |
61 | strerror(errno))); | 61 | strerror(errno))); |
62 | cgit_print_docend(); | 62 | cgit_print_docend(); |
63 | return; | 63 | return; |
64 | } | 64 | } |
65 | 65 | ||
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); | 66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
67 | show_search = 0; | 67 | show_search = 0; |
68 | setenv("GIT_DIR", cgit_repo->path, 1); | 68 | setenv("GIT_DIR", cgit_repo->path, 1); |
69 | 69 | ||
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { | 70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
71 | cgit_print_snapshot(item, cgit_query_sha1, | 71 | cgit_print_snapshot(item, cgit_query_sha1, |
72 | cgit_repobasename(cgit_repo->url), | 72 | cgit_repobasename(cgit_repo->url), |
73 | cgit_query_name); | 73 | cgit_query_name, |
74 | cgit_repo->snapshots ); | ||
74 | return; | 75 | return; |
75 | } | 76 | } |
76 | 77 | ||
77 | if (cgit_cmd == CMD_BLOB) { | 78 | if (cgit_cmd == CMD_BLOB) { |
78 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
79 | return; | 80 | return; |
80 | } | 81 | } |
81 | 82 | ||
82 | show_search = (cgit_cmd == CMD_LOG); | 83 | show_search = (cgit_cmd == CMD_LOG); |
83 | cgit_print_docstart(title, item); | 84 | cgit_print_docstart(title, item); |
84 | if (!cgit_cmd) { | 85 | if (!cgit_cmd) { |
85 | cgit_print_pageheader("summary", show_search); | 86 | cgit_print_pageheader("summary", show_search); |
86 | cgit_print_summary(); | 87 | cgit_print_summary(); |
87 | cgit_print_docend(); | 88 | cgit_print_docend(); |
88 | return; | 89 | return; |
89 | } | 90 | } |
90 | 91 | ||
91 | cgit_print_pageheader(cgit_query_page, show_search); | 92 | cgit_print_pageheader(cgit_query_page, show_search); |
92 | 93 | ||
93 | switch(cgit_cmd) { | 94 | switch(cgit_cmd) { |
94 | case CMD_LOG: | 95 | case CMD_LOG: |
95 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, | 96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
96 | cgit_max_commit_count, cgit_query_search, | 97 | cgit_max_commit_count, cgit_query_search, |
97 | cgit_query_path, 1); | 98 | cgit_query_path, 1); |
98 | break; | 99 | break; |
99 | case CMD_TREE: | 100 | case CMD_TREE: |
100 | cgit_print_tree(cgit_query_sha1, cgit_query_path); | 101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
101 | break; | 102 | break; |
102 | case CMD_COMMIT: | 103 | case CMD_COMMIT: |
103 | cgit_print_commit(cgit_query_sha1); | 104 | cgit_print_commit(cgit_query_sha1); |
104 | break; | 105 | break; |
105 | case CMD_DIFF: | 106 | case CMD_DIFF: |
106 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | 107 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
107 | break; | 108 | break; |
108 | default: | 109 | default: |
109 | cgit_print_error("Invalid request"); | 110 | cgit_print_error("Invalid request"); |
110 | } | 111 | } |
111 | cgit_print_docend(); | 112 | cgit_print_docend(); |
112 | } | 113 | } |
113 | 114 | ||
114 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 115 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
115 | { | 116 | { |
116 | static char buf[PATH_MAX]; | 117 | static char buf[PATH_MAX]; |
117 | int stdout2; | 118 | int stdout2; |
118 | 119 | ||
119 | getcwd(buf, sizeof(buf)); | 120 | getcwd(buf, sizeof(buf)); |
120 | item->st.st_mtime = time(NULL); | 121 | item->st.st_mtime = time(NULL); |
121 | 122 | ||
122 | if (use_cache) { | 123 | if (use_cache) { |
123 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 124 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
124 | "Preserving STDOUT"); | 125 | "Preserving STDOUT"); |
125 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 126 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
126 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 127 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
127 | } | 128 | } |
128 | 129 | ||
129 | if (cgit_repo) | 130 | if (cgit_repo) |
130 | cgit_print_repo_page(item); | 131 | cgit_print_repo_page(item); |
131 | else | 132 | else |
132 | cgit_print_repolist(item); | 133 | cgit_print_repolist(item); |
133 | 134 | ||
134 | if (use_cache) { | 135 | if (use_cache) { |
135 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 136 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
136 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 137 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
137 | "Restoring original STDOUT"); | 138 | "Restoring original STDOUT"); |
138 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 139 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
139 | } | 140 | } |
140 | 141 | ||
141 | chdir(buf); | 142 | chdir(buf); |
142 | } | 143 | } |
143 | 144 | ||
144 | static void cgit_check_cache(struct cacheitem *item) | 145 | static void cgit_check_cache(struct cacheitem *item) |
145 | { | 146 | { |
146 | int i = 0; | 147 | int i = 0; |
147 | 148 | ||
148 | top: | 149 | top: |
149 | if (++i > cgit_max_lock_attempts) { | 150 | if (++i > cgit_max_lock_attempts) { |
150 | die("cgit_refresh_cache: unable to lock %s: %s", | 151 | die("cgit_refresh_cache: unable to lock %s: %s", |
151 | item->name, strerror(errno)); | 152 | item->name, strerror(errno)); |
152 | } | 153 | } |
153 | if (!cache_exist(item)) { | 154 | if (!cache_exist(item)) { |
154 | if (!cache_lock(item)) { | 155 | if (!cache_lock(item)) { |
155 | sleep(1); | 156 | sleep(1); |
156 | goto top; | 157 | goto top; |
157 | } | 158 | } |
158 | if (!cache_exist(item)) { | 159 | if (!cache_exist(item)) { |
159 | cgit_fill_cache(item, 1); | 160 | cgit_fill_cache(item, 1); |
160 | cache_unlock(item); | 161 | cache_unlock(item); |
161 | } else { | 162 | } else { |
162 | cache_cancel_lock(item); | 163 | cache_cancel_lock(item); |
163 | } | 164 | } |
164 | } else if (cache_expired(item) && cache_lock(item)) { | 165 | } else if (cache_expired(item) && cache_lock(item)) { |
165 | if (cache_expired(item)) { | 166 | if (cache_expired(item)) { |
166 | cgit_fill_cache(item, 1); | 167 | cgit_fill_cache(item, 1); |
167 | cache_unlock(item); | 168 | cache_unlock(item); |
168 | } else { | 169 | } else { |
169 | cache_cancel_lock(item); | 170 | cache_cancel_lock(item); |