about summary refs log tree commit diff stats
path: root/cache.c
diff options
context:
space:
mode:
authorJohn Keeping2013-05-18 18:46:39 +0100
committerJason A. Donenfeld2013-05-22 12:53:06 +0200
commitf32a2da636ffa6eaa6b8d0d3f35a673fa12e404a (patch)
treeea1411cc37fa359cadc7abf1f2bd7bd080ff2bd5 /cache.c
parenttests: introduce strip_header() helper function (diff)
downloadcgit-f32a2da636ffa6eaa6b8d0d3f35a673fa12e404a.tar.gz
cgit-f32a2da636ffa6eaa6b8d0d3f35a673fa12e404a.zip
cache.c: cache ls_cache output properly
By using the standard library's printf, cache_ls does not redirect its
output to the cache when we change the process' stdout file descriptor
to point to the cache file.  Fix this by using "htmlf" in the same way
that we do for writing HTTP headers.

Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'cache.c')
-rw-r--r--cache.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/cache.c b/cache.c index 74a1795..aa870e3 100644 --- a/cache.c +++ b/cache.c
@@ -15,6 +15,7 @@
15 15
16#include "cgit.h" 16#include "cgit.h"
17#include "cache.h" 17#include "cache.h"
18#include "html.h"
18 19
19#define CACHE_BUFSIZE (1024 * 4) 20#define CACHE_BUFSIZE (1024 * 4)
20 21
@@ -404,12 +405,12 @@ int cache_ls(const char *path)
404 fullname.buf, strerror(err), err); 405 fullname.buf, strerror(err), err);
405 continue; 406 continue;
406 } 407 }
407 printf("%s %s %10"PRIuMAX" %s\n", 408 htmlf("%s %s %10"PRIuMAX" %s\n",
408 fullname.buf, 409 fullname.buf,
409 sprintftime("%Y-%m-%d %H:%M:%S", 410 sprintftime("%Y-%m-%d %H:%M:%S",
410 slot.cache_st.st_mtime), 411 slot.cache_st.st_mtime),
411 (uintmax_t)slot.cache_st.st_size, 412 (uintmax_t)slot.cache_st.st_size,
412 slot.buf); 413 slot.buf);
413 close_slot(&slot); 414 close_slot(&slot);
414 } 415 }
415 closedir(dir); 416 closedir(dir);