|
diff --git a/cache.c b/cache.c index e590d7b..b701e13 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -287,57 +287,125 @@ int cache_process(int size, const char *path, const char *key, int ttl, |
287 | int len, i; |
287 | int len, i; |
288 | char filename[1024]; |
288 | char filename[1024]; |
289 | char lockname[1024 + 5]; /* 5 = ".lock" */ |
289 | char lockname[1024 + 5]; /* 5 = ".lock" */ |
290 | struct cache_slot slot; |
290 | struct cache_slot slot; |
291 | |
291 | |
292 | /* If the cache is disabled, just generate the content */ |
292 | /* If the cache is disabled, just generate the content */ |
293 | if (size <= 0) { |
293 | if (size <= 0) { |
294 | fn(cbdata); |
294 | fn(cbdata); |
295 | return 0; |
295 | return 0; |
296 | } |
296 | } |
297 | |
297 | |
298 | /* Verify input, calculate filenames */ |
298 | /* Verify input, calculate filenames */ |
299 | if (!path) { |
299 | if (!path) { |
300 | cache_log("[cgit] Cache path not specified, caching is disabled\n"); |
300 | cache_log("[cgit] Cache path not specified, caching is disabled\n"); |
301 | fn(cbdata); |
301 | fn(cbdata); |
302 | return 0; |
302 | return 0; |
303 | } |
303 | } |
304 | len = strlen(path); |
304 | len = strlen(path); |
305 | if (len > sizeof(filename) - 10) { /* 10 = "/01234567\0" */ |
305 | if (len > sizeof(filename) - 10) { /* 10 = "/01234567\0" */ |
306 | cache_log("[cgit] Cache path too long, caching is disabled: %s\n", |
306 | cache_log("[cgit] Cache path too long, caching is disabled: %s\n", |
307 | path); |
307 | path); |
308 | fn(cbdata); |
308 | fn(cbdata); |
309 | return 0; |
309 | return 0; |
310 | } |
310 | } |
311 | if (!key) |
311 | if (!key) |
312 | key = ""; |
312 | key = ""; |
313 | hash = hash_str(key) % size; |
313 | hash = hash_str(key) % size; |
314 | strcpy(filename, path); |
314 | strcpy(filename, path); |
315 | if (filename[len - 1] != '/') |
315 | if (filename[len - 1] != '/') |
316 | filename[len++] = '/'; |
316 | filename[len++] = '/'; |
317 | for(i = 0; i < 8; i++) { |
317 | for(i = 0; i < 8; i++) { |
318 | sprintf(filename + len++, "%x", |
318 | sprintf(filename + len++, "%x", |
319 | (unsigned char)(hash & 0xf)); |
319 | (unsigned char)(hash & 0xf)); |
320 | hash >>= 4; |
320 | hash >>= 4; |
321 | } |
321 | } |
322 | filename[len] = '\0'; |
322 | filename[len] = '\0'; |
323 | strcpy(lockname, filename); |
323 | strcpy(lockname, filename); |
324 | strcpy(lockname + len, ".lock"); |
324 | strcpy(lockname + len, ".lock"); |
325 | slot.fn = fn; |
325 | slot.fn = fn; |
326 | slot.cbdata = cbdata; |
326 | slot.cbdata = cbdata; |
327 | slot.ttl = ttl; |
327 | slot.ttl = ttl; |
328 | slot.cache_name = filename; |
328 | slot.cache_name = filename; |
329 | slot.lock_name = lockname; |
329 | slot.lock_name = lockname; |
330 | slot.key = key; |
330 | slot.key = key; |
331 | slot.keylen = strlen(key); |
331 | slot.keylen = strlen(key); |
332 | return process_slot(&slot); |
332 | return process_slot(&slot); |
333 | } |
333 | } |
334 | |
334 | |
| |
335 | /* Return a strftime formatted date/time |
| |
336 | * NB: the result from this function is to shared memory |
| |
337 | */ |
| |
338 | char *sprintftime(const char *format, time_t time) |
| |
339 | { |
| |
340 | static char buf[64]; |
| |
341 | struct tm *tm; |
| |
342 | |
| |
343 | if (!time) |
| |
344 | return NULL; |
| |
345 | tm = gmtime(&time); |
| |
346 | strftime(buf, sizeof(buf)-1, format, tm); |
| |
347 | return buf; |
| |
348 | } |
| |
349 | |
| |
350 | int cache_ls(const char *path) |
| |
351 | { |
| |
352 | DIR *dir; |
| |
353 | struct dirent *ent; |
| |
354 | int err = 0; |
| |
355 | struct cache_slot slot; |
| |
356 | char fullname[1024]; |
| |
357 | char *name; |
| |
358 | |
| |
359 | if (!path) { |
| |
360 | cache_log("[cgit] cache path not specified\n"); |
| |
361 | return -1; |
| |
362 | } |
| |
363 | if (strlen(path) > 1024 - 10) { |
| |
364 | cache_log("[cgit] cache path too long: %s\n", |
| |
365 | path); |
| |
366 | return -1; |
| |
367 | } |
| |
368 | dir = opendir(path); |
| |
369 | if (!dir) { |
| |
370 | err = errno; |
| |
371 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
| |
372 | path, strerror(err), err); |
| |
373 | return err; |
| |
374 | } |
| |
375 | strcpy(fullname, path); |
| |
376 | name = fullname + strlen(path); |
| |
377 | if (*(name - 1) != '/') { |
| |
378 | *name++ = '/'; |
| |
379 | *name = '\0'; |
| |
380 | } |
| |
381 | slot.cache_name = fullname; |
| |
382 | while((ent = readdir(dir)) != NULL) { |
| |
383 | if (strlen(ent->d_name) != 8) |
| |
384 | continue; |
| |
385 | strcpy(name, ent->d_name); |
| |
386 | if ((err = open_slot(&slot)) != 0) { |
| |
387 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
| |
388 | fullname, strerror(err), err); |
| |
389 | continue; |
| |
390 | } |
| |
391 | printf("%s %s %10lld %s\n", |
| |
392 | name, |
| |
393 | sprintftime("%Y-%m-%d %H:%M:%S", |
| |
394 | slot.cache_st.st_mtime), |
| |
395 | slot.cache_st.st_size, |
| |
396 | slot.buf); |
| |
397 | close_slot(&slot); |
| |
398 | } |
| |
399 | closedir(dir); |
| |
400 | return 0; |
| |
401 | } |
| |
402 | |
335 | /* Print a message to stdout */ |
403 | /* Print a message to stdout */ |
336 | void cache_log(const char *format, ...) |
404 | void cache_log(const char *format, ...) |
337 | { |
405 | { |
338 | va_list args; |
406 | va_list args; |
339 | va_start(args, format); |
407 | va_start(args, format); |
340 | vfprintf(stderr, format, args); |
408 | vfprintf(stderr, format, args); |
341 | va_end(args); |
409 | va_end(args); |
342 | } |
410 | } |
343 | |
411 | |
|