summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 1b85b15..cc18ed4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,192 +10,195 @@
10 10
11static int cgit_prepare_cache(struct cacheitem *item) 11static 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
48static void cgit_print_repo_page(struct cacheitem *item) 48static 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_head, cgit_query_sha1, 71 cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
72 cgit_repobasename(cgit_repo->url), 72 cgit_repobasename(cgit_repo->url),
73 cgit_query_path, 73 cgit_query_path,
74 cgit_repo->snapshots ); 74 cgit_repo->snapshots );
75 return; 75 return;
76 } 76 }
77 77
78 if (cgit_cmd == CMD_BLOB) { 78 if (cgit_cmd == CMD_BLOB) {
79 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 79 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
80 return; 80 return;
81 } 81 }
82 82
83 show_search = (cgit_cmd == CMD_LOG); 83 show_search = (cgit_cmd == CMD_LOG);
84 cgit_print_docstart(title, item); 84 cgit_print_docstart(title, item);
85 if (!cgit_cmd) { 85 if (!cgit_cmd) {
86 cgit_print_pageheader("summary", show_search); 86 cgit_print_pageheader("summary", show_search);
87 cgit_print_summary(); 87 cgit_print_summary();
88 cgit_print_docend(); 88 cgit_print_docend();
89 return; 89 return;
90 } 90 }
91 91
92 cgit_print_pageheader(cgit_query_page, show_search); 92 cgit_print_pageheader(cgit_query_page, show_search);
93 93
94 switch(cgit_cmd) { 94 switch(cgit_cmd) {
95 case CMD_LOG: 95 case CMD_LOG:
96 cgit_print_log(cgit_query_sha1, cgit_query_ofs, 96 cgit_print_log(cgit_query_sha1, cgit_query_ofs,
97 cgit_max_commit_count, cgit_query_search, 97 cgit_max_commit_count, cgit_query_search,
98 cgit_query_path, 1); 98 cgit_query_path, 1);
99 break; 99 break;
100 case CMD_TREE: 100 case CMD_TREE:
101 cgit_print_tree(cgit_query_sha1, cgit_query_path); 101 cgit_print_tree(cgit_query_sha1, cgit_query_path);
102 break; 102 break;
103 case CMD_COMMIT: 103 case CMD_COMMIT:
104 cgit_print_commit(cgit_query_sha1); 104 cgit_print_commit(cgit_query_sha1);
105 break; 105 break;
106 case CMD_REFS:
107 cgit_print_refs();
108 break;
106 case CMD_TAG: 109 case CMD_TAG:
107 cgit_print_tag(cgit_query_sha1); 110 cgit_print_tag(cgit_query_sha1);
108 break; 111 break;
109 case CMD_DIFF: 112 case CMD_DIFF:
110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); 113 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
111 break; 114 break;
112 default: 115 default:
113 cgit_print_error("Invalid request"); 116 cgit_print_error("Invalid request");
114 } 117 }
115 cgit_print_docend(); 118 cgit_print_docend();
116} 119}
117 120
118static void cgit_fill_cache(struct cacheitem *item, int use_cache) 121static void cgit_fill_cache(struct cacheitem *item, int use_cache)
119{ 122{
120 static char buf[PATH_MAX]; 123 static char buf[PATH_MAX];
121 int stdout2; 124 int stdout2;
122 125
123 getcwd(buf, sizeof(buf)); 126 getcwd(buf, sizeof(buf));
124 item->st.st_mtime = time(NULL); 127 item->st.st_mtime = time(NULL);
125 128
126 if (use_cache) { 129 if (use_cache) {
127 stdout2 = chk_positive(dup(STDOUT_FILENO), 130 stdout2 = chk_positive(dup(STDOUT_FILENO),
128 "Preserving STDOUT"); 131 "Preserving STDOUT");
129 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 132 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 133 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
131 } 134 }
132 135
133 if (cgit_repo) 136 if (cgit_repo)
134 cgit_print_repo_page(item); 137 cgit_print_repo_page(item);
135 else 138 else
136 cgit_print_repolist(item); 139 cgit_print_repolist(item);
137 140
138 if (use_cache) { 141 if (use_cache) {
139 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 142 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
140 chk_positive(dup2(stdout2, STDOUT_FILENO), 143 chk_positive(dup2(stdout2, STDOUT_FILENO),
141 "Restoring original STDOUT"); 144 "Restoring original STDOUT");
142 chk_zero(close(stdout2), "Closing temporary STDOUT"); 145 chk_zero(close(stdout2), "Closing temporary STDOUT");
143 } 146 }
144 147
145 chdir(buf); 148 chdir(buf);
146} 149}
147 150
148static void cgit_check_cache(struct cacheitem *item) 151static void cgit_check_cache(struct cacheitem *item)
149{ 152{
150 int i = 0; 153 int i = 0;
151 154
152 top: 155 top:
153 if (++i > cgit_max_lock_attempts) { 156 if (++i > cgit_max_lock_attempts) {
154 die("cgit_refresh_cache: unable to lock %s: %s", 157 die("cgit_refresh_cache: unable to lock %s: %s",
155 item->name, strerror(errno)); 158 item->name, strerror(errno));
156 } 159 }
157 if (!cache_exist(item)) { 160 if (!cache_exist(item)) {
158 if (!cache_lock(item)) { 161 if (!cache_lock(item)) {
159 sleep(1); 162 sleep(1);
160 goto top; 163 goto top;
161 } 164 }
162 if (!cache_exist(item)) { 165 if (!cache_exist(item)) {
163 cgit_fill_cache(item, 1); 166 cgit_fill_cache(item, 1);
164 cache_unlock(item); 167 cache_unlock(item);
165 } else { 168 } else {
166 cache_cancel_lock(item); 169 cache_cancel_lock(item);
167 } 170 }
168 } else if (cache_expired(item) && cache_lock(item)) { 171 } else if (cache_expired(item) && cache_lock(item)) {
169 if (cache_expired(item)) { 172 if (cache_expired(item)) {
170 cgit_fill_cache(item, 1); 173 cgit_fill_cache(item, 1);
171 cache_unlock(item); 174 cache_unlock(item);
172 } else { 175 } else {
173 cache_cancel_lock(item); 176 cache_cancel_lock(item);
174 } 177 }
175 } 178 }
176} 179}
177 180
178static void cgit_print_cache(struct cacheitem *item) 181static void cgit_print_cache(struct cacheitem *item)
179{ 182{
180 static char buf[4096]; 183 static char buf[4096];
181 ssize_t i; 184 ssize_t i;
182 185
183 int fd = open(item->name, O_RDONLY); 186 int fd = open(item->name, O_RDONLY);
184 if (fd<0) 187 if (fd<0)
185 die("Unable to open cached file %s", item->name); 188 die("Unable to open cached file %s", item->name);
186 189
187 while((i=read(fd, buf, sizeof(buf))) > 0) 190 while((i=read(fd, buf, sizeof(buf))) > 0)
188 write(STDOUT_FILENO, buf, i); 191 write(STDOUT_FILENO, buf, i);
189 192
190 close(fd); 193 close(fd);
191} 194}
192 195
193static void cgit_parse_args(int argc, const char **argv) 196static void cgit_parse_args(int argc, const char **argv)
194{ 197{
195 int i; 198 int i;
196 199
197 for (i = 1; i < argc; i++) { 200 for (i = 1; i < argc; i++) {
198 if (!strncmp(argv[i], "--cache=", 8)) { 201 if (!strncmp(argv[i], "--cache=", 8)) {
199 cgit_cache_root = xstrdup(argv[i]+8); 202 cgit_cache_root = xstrdup(argv[i]+8);
200 } 203 }
201 if (!strcmp(argv[i], "--nocache")) { 204 if (!strcmp(argv[i], "--nocache")) {