crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cache.c: cache ls_cache output properly

Browse Source 
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>
This commit is contained in:
John Keeping 2013-05-18 18:46:39 +01:00 committed by Jason A. Donenfeld
parent 75bfec6448
commit f32a2da636
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cache.c
View File

@ -15,6 +15,7 @@
#include "cgit.h" #include "cgit.h"
#include "cache.h" #include "cache.h"
#include "html.h"
#define CACHE_BUFSIZE (1024 * 4) #define CACHE_BUFSIZE (1024 * 4)
@ -404,12 +405,12 @@ int cache_ls(const char *path)
fullname.buf, strerror(err), err); fullname.buf, strerror(err), err);
continue; continue;
} }
printf("%s %s %10"PRIuMAX" %s\n", htmlf("%s %s %10"PRIuMAX" %s\n",
fullname.buf, fullname.buf,
sprintftime("%Y-%m-%d %H:%M:%S", sprintftime("%Y-%m-%d %H:%M:%S",
slot.cache_st.st_mtime), slot.cache_st.st_mtime),
(uintmax_t)slot.cache_st.st_size, (uintmax_t)slot.cache_st.st_size,
slot.buf); slot.buf);
close_slot(&slot); close_slot(&slot);
} }
closedir(dir); closedir(dir);

8
tests/t0020-validate-cache.sh
View File

@ -66,7 +66,13 @@ test_expect_success 'verify cache-size=1021' '
cgit_url "bar/diff" && cgit_url "bar/diff" &&
cgit_url "bar/patch" && cgit_url "bar/patch" &&
ls cache >output && ls cache >output &&
test_line_count = 13 output test_line_count = 13 output &&
cgit_url "foo/ls_cache" >output.full &&
strip_headers <output.full >output &&
test_line_count = 13 output &&
# Check that ls_cache output is cached correctly
cgit_url "foo/ls_cache" >output.second &&
test_cmp output.full output.second
' '
test_done test_done