|
diff --git a/cgit.c b/cgit.c index 2c933dc..e6b4526 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -230,88 +230,87 @@ static void cgit_check_cache(struct cacheitem *item) |
230 | if (cache_expired(item)) { |
230 | if (cache_expired(item)) { |
231 | cgit_fill_cache(item, 1); |
231 | cgit_fill_cache(item, 1); |
232 | cache_unlock(item); |
232 | cache_unlock(item); |
233 | } else { |
233 | } else { |
234 | cache_cancel_lock(item); |
234 | cache_cancel_lock(item); |
235 | } |
235 | } |
236 | } |
236 | } |
237 | } |
237 | } |
238 | |
238 | |
239 | static void cgit_print_cache(struct cacheitem *item) |
239 | static void cgit_print_cache(struct cacheitem *item) |
240 | { |
240 | { |
241 | static char buf[4096]; |
241 | static char buf[4096]; |
242 | ssize_t i; |
242 | ssize_t i; |
243 | |
243 | |
244 | int fd = open(item->name, O_RDONLY); |
244 | int fd = open(item->name, O_RDONLY); |
245 | if (fd<0) |
245 | if (fd<0) |
246 | die("Unable to open cached file %s", item->name); |
246 | die("Unable to open cached file %s", item->name); |
247 | |
247 | |
248 | while((i=read(fd, buf, sizeof(buf))) > 0) |
248 | while((i=read(fd, buf, sizeof(buf))) > 0) |
249 | write(STDOUT_FILENO, buf, i); |
249 | write(STDOUT_FILENO, buf, i); |
250 | |
250 | |
251 | close(fd); |
251 | close(fd); |
252 | } |
252 | } |
253 | |
253 | |
254 | static void cgit_parse_args(int argc, const char **argv) |
254 | static void cgit_parse_args(int argc, const char **argv) |
255 | { |
255 | { |
256 | int i; |
256 | int i; |
257 | |
257 | |
258 | for (i = 1; i < argc; i++) { |
258 | for (i = 1; i < argc; i++) { |
259 | if (!strncmp(argv[i], "--cache=", 8)) { |
259 | if (!strncmp(argv[i], "--cache=", 8)) { |
260 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
260 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
261 | } |
261 | } |
262 | if (!strcmp(argv[i], "--nocache")) { |
262 | if (!strcmp(argv[i], "--nocache")) { |
263 | ctx.cfg.nocache = 1; |
263 | ctx.cfg.nocache = 1; |
264 | } |
264 | } |
265 | if (!strncmp(argv[i], "--query=", 8)) { |
265 | if (!strncmp(argv[i], "--query=", 8)) { |
266 | ctx.qry.raw = xstrdup(argv[i]+8); |
266 | ctx.qry.raw = xstrdup(argv[i]+8); |
267 | } |
267 | } |
268 | if (!strncmp(argv[i], "--repo=", 7)) { |
268 | if (!strncmp(argv[i], "--repo=", 7)) { |
269 | ctx.qry.repo = xstrdup(argv[i]+7); |
269 | ctx.qry.repo = xstrdup(argv[i]+7); |
270 | } |
270 | } |
271 | if (!strncmp(argv[i], "--page=", 7)) { |
271 | if (!strncmp(argv[i], "--page=", 7)) { |
272 | ctx.qry.page = xstrdup(argv[i]+7); |
272 | ctx.qry.page = xstrdup(argv[i]+7); |
273 | } |
273 | } |
274 | if (!strncmp(argv[i], "--head=", 7)) { |
274 | if (!strncmp(argv[i], "--head=", 7)) { |
275 | ctx.qry.head = xstrdup(argv[i]+7); |
275 | ctx.qry.head = xstrdup(argv[i]+7); |
276 | ctx.qry.has_symref = 1; |
276 | ctx.qry.has_symref = 1; |
277 | } |
277 | } |
278 | if (!strncmp(argv[i], "--sha1=", 7)) { |
278 | if (!strncmp(argv[i], "--sha1=", 7)) { |
279 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
279 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
280 | ctx.qry.has_sha1 = 1; |
280 | ctx.qry.has_sha1 = 1; |
281 | } |
281 | } |
282 | if (!strncmp(argv[i], "--ofs=", 6)) { |
282 | if (!strncmp(argv[i], "--ofs=", 6)) { |
283 | ctx.qry.ofs = atoi(argv[i]+6); |
283 | ctx.qry.ofs = atoi(argv[i]+6); |
284 | } |
284 | } |
285 | } |
285 | } |
286 | } |
286 | } |
287 | |
287 | |
288 | int main(int argc, const char **argv) |
288 | int main(int argc, const char **argv) |
289 | { |
289 | { |
290 | struct cacheitem item; |
290 | struct cacheitem item; |
291 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
291 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
292 | |
292 | |
293 | cgit_prepare_context(&ctx); |
293 | cgit_prepare_context(&ctx); |
294 | htmlfd = STDOUT_FILENO; |
| |
295 | item.st.st_mtime = time(NULL); |
294 | item.st.st_mtime = time(NULL); |
296 | cgit_repolist.length = 0; |
295 | cgit_repolist.length = 0; |
297 | cgit_repolist.count = 0; |
296 | cgit_repolist.count = 0; |
298 | cgit_repolist.repos = NULL; |
297 | cgit_repolist.repos = NULL; |
299 | |
298 | |
300 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
299 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
301 | cgit_global_config_cb); |
300 | cgit_global_config_cb); |
302 | if (getenv("SCRIPT_NAME")) |
301 | if (getenv("SCRIPT_NAME")) |
303 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
302 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
304 | if (getenv("QUERY_STRING")) |
303 | if (getenv("QUERY_STRING")) |
305 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
304 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
306 | cgit_parse_args(argc, argv); |
305 | cgit_parse_args(argc, argv); |
307 | cgit_parse_query(ctx.qry.raw, cgit_querystring_cb); |
306 | cgit_parse_query(ctx.qry.raw, cgit_querystring_cb); |
308 | if (!cgit_prepare_cache(&item)) |
307 | if (!cgit_prepare_cache(&item)) |
309 | return 0; |
308 | return 0; |
310 | if (ctx.cfg.nocache) { |
309 | if (ctx.cfg.nocache) { |
311 | cgit_fill_cache(&item, 0); |
310 | cgit_fill_cache(&item, 0); |
312 | } else { |
311 | } else { |
313 | cgit_check_cache(&item); |
312 | cgit_check_cache(&item); |
314 | cgit_print_cache(&item); |
313 | cgit_print_cache(&item); |
315 | } |
314 | } |
316 | return 0; |
315 | return 0; |
317 | } |
316 | } |
|