author | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 18:18:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 18:18:27 (UTC) |
commit | b8a7eb12d459c48943e31762b24b169af8c427a1 (patch) (unidiff) | |
tree | bb5bfcf6e5f71a478e7586bd1d128aa94bfd7dbe /cache.c | |
parent | 140012d7a8e51df5a9f9c556696778b86ade4fc9 (diff) | |
parent | e4d2f2b042100182ff5b214fd6848b71d70fad7d (diff) | |
download | cgit-b8a7eb12d459c48943e31762b24b169af8c427a1.zip cgit-b8a7eb12d459c48943e31762b24b169af8c427a1.tar.gz cgit-b8a7eb12d459c48943e31762b24b169af8c427a1.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -371,69 +371,69 @@ char *sprintftime(const char *format, time_t time) | |||
371 | if (!time) | 371 | if (!time) |
372 | return NULL; | 372 | return NULL; |
373 | tm = gmtime(&time); | 373 | tm = gmtime(&time); |
374 | strftime(buf, sizeof(buf)-1, format, tm); | 374 | strftime(buf, sizeof(buf)-1, format, tm); |
375 | return buf; | 375 | return buf; |
376 | } | 376 | } |
377 | 377 | ||
378 | int cache_ls(const char *path) | 378 | int cache_ls(const char *path) |
379 | { | 379 | { |
380 | DIR *dir; | 380 | DIR *dir; |
381 | struct dirent *ent; | 381 | struct dirent *ent; |
382 | int err = 0; | 382 | int err = 0; |
383 | struct cache_slot slot; | 383 | struct cache_slot slot; |
384 | char fullname[1024]; | 384 | char fullname[1024]; |
385 | char *name; | 385 | char *name; |
386 | 386 | ||
387 | if (!path) { | 387 | if (!path) { |
388 | cache_log("[cgit] cache path not specified\n"); | 388 | cache_log("[cgit] cache path not specified\n"); |
389 | return -1; | 389 | return -1; |
390 | } | 390 | } |
391 | if (strlen(path) > 1024 - 10) { | 391 | if (strlen(path) > 1024 - 10) { |
392 | cache_log("[cgit] cache path too long: %s\n", | 392 | cache_log("[cgit] cache path too long: %s\n", |
393 | path); | 393 | path); |
394 | return -1; | 394 | return -1; |
395 | } | 395 | } |
396 | dir = opendir(path); | 396 | dir = opendir(path); |
397 | if (!dir) { | 397 | if (!dir) { |
398 | err = errno; | 398 | err = errno; |
399 | cache_log("[cgit] unable to open path %s: %s (%d)\n", | 399 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
400 | path, strerror(err), err); | 400 | path, strerror(err), err); |
401 | return err; | 401 | return err; |
402 | } | 402 | } |
403 | strcpy(fullname, path); | 403 | strcpy(fullname, path); |
404 | name = fullname + strlen(path); | 404 | name = fullname + strlen(path); |
405 | if (*(name - 1) != '/') { | 405 | if (*(name - 1) != '/') { |
406 | *name++ = '/'; | 406 | *name++ = '/'; |
407 | *name = '\0'; | 407 | *name = '\0'; |
408 | } | 408 | } |
409 | slot.cache_name = fullname; | 409 | slot.cache_name = fullname; |
410 | while((ent = readdir(dir)) != NULL) { | 410 | while((ent = readdir(dir)) != NULL) { |
411 | if (strlen(ent->d_name) != 8) | 411 | if (strlen(ent->d_name) != 8) |
412 | continue; | 412 | continue; |
413 | strcpy(name, ent->d_name); | 413 | strcpy(name, ent->d_name); |
414 | if ((err = open_slot(&slot)) != 0) { | 414 | if ((err = open_slot(&slot)) != 0) { |
415 | cache_log("[cgit] unable to open path %s: %s (%d)\n", | 415 | cache_log("[cgit] unable to open path %s: %s (%d)\n", |
416 | fullname, strerror(err), err); | 416 | fullname, strerror(err), err); |
417 | continue; | 417 | continue; |
418 | } | 418 | } |
419 | printf("%s %s %10zd %s\n", | 419 | printf("%s %s %10"PRIuMAX" %s\n", |
420 | name, | 420 | name, |
421 | sprintftime("%Y-%m-%d %H:%M:%S", | 421 | sprintftime("%Y-%m-%d %H:%M:%S", |
422 | slot.cache_st.st_mtime), | 422 | slot.cache_st.st_mtime), |
423 | slot.cache_st.st_size, | 423 | (uintmax_t)slot.cache_st.st_size, |
424 | slot.buf); | 424 | slot.buf); |
425 | close_slot(&slot); | 425 | close_slot(&slot); |
426 | } | 426 | } |
427 | closedir(dir); | 427 | closedir(dir); |
428 | return 0; | 428 | return 0; |
429 | } | 429 | } |
430 | 430 | ||
431 | /* Print a message to stdout */ | 431 | /* Print a message to stdout */ |
432 | void cache_log(const char *format, ...) | 432 | void cache_log(const char *format, ...) |
433 | { | 433 | { |
434 | va_list args; | 434 | va_list args; |
435 | va_start(args, format); | 435 | va_start(args, format); |
436 | vfprintf(stderr, format, args); | 436 | vfprintf(stderr, format, args); |
437 | va_end(args); | 437 | va_end(args); |
438 | } | 438 | } |
439 | 439 | ||