From e34a3b5adc00255f8acb7d674e5fdadef2ac80f7 Mon Sep 17 00:00:00 2001 From: Danijel TaĊĦov Date: Mon, 2 Nov 2009 22:10:04 +0100 Subject: Nov is the correct abbreviation --- ui-shared.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-shared.c b/ui-shared.c index 07d5dd4..4049a2b 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -20,7 +20,7 @@ static char *http_date(time_t t) {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; struct tm *tm = gmtime(&t); return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, -- cgit v1.2.3-57-g22cb From 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 Mon Sep 17 00:00:00 2001 From: Rys Sommefeldt Date: Sat, 7 Nov 2009 15:24:45 +0100 Subject: Close fd on error in readfile() Signed-off-by: Lars Hjemli --- shared.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shared.c b/shared.c index d7b2d5a..a27ab30 100644 --- a/shared.c +++ b/shared.c @@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size) fd = open(path, O_RDONLY); if (fd == -1) return errno; - if (fstat(fd, &st)) + if (fstat(fd, &st)) { + close(fd); return errno; - if (!S_ISREG(st.st_mode)) + } + if (!S_ISREG(st.st_mode)) { + close(fd); return EISDIR; + } *buf = xmalloc(st.st_size + 1); *size = read_in_full(fd, *buf, st.st_size); (*buf)[*size] = '\0'; + close(fd); return (*size == st.st_size ? 0 : errno); } -- cgit v1.2.3-57-g22cb