diff options
| author | Lars Hjemli | 2009-11-07 15:35:36 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-11-07 15:35:36 +0100 |
| commit | 4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) | |
| tree | 593616b5bd2e8c662d00478f50ecee86a0002224 | |
| parent | ui-shared.c: prettify download links when generated from tag page (diff) | |
| parent | Close fd on error in readfile() (diff) | |
| download | cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip | |
Merge branch 'stable'
| -rw-r--r-- | shared.c | 9 | ||||
| -rw-r--r-- | ui-shared.c | 2 |
2 files changed, 8 insertions, 3 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) | |||
| 406 | fd = open(path, O_RDONLY); | 406 | fd = open(path, O_RDONLY); |
| 407 | if (fd == -1) | 407 | if (fd == -1) |
| 408 | return errno; | 408 | return errno; |
| 409 | if (fstat(fd, &st)) | 409 | if (fstat(fd, &st)) { |
| 410 | close(fd); | ||
| 410 | return errno; | 411 | return errno; |
| 411 | if (!S_ISREG(st.st_mode)) | 412 | } |
| 413 | if (!S_ISREG(st.st_mode)) { | ||
| 414 | close(fd); | ||
| 412 | return EISDIR; | 415 | return EISDIR; |
| 416 | } | ||
| 413 | *buf = xmalloc(st.st_size + 1); | 417 | *buf = xmalloc(st.st_size + 1); |
| 414 | *size = read_in_full(fd, *buf, st.st_size); | 418 | *size = read_in_full(fd, *buf, st.st_size); |
| 415 | (*buf)[*size] = '\0'; | 419 | (*buf)[*size] = '\0'; |
| 420 | close(fd); | ||
| 416 | return (*size == st.st_size ? 0 : errno); | 421 | return (*size == st.st_size ? 0 : errno); |
| 417 | } | 422 | } |
| diff --git a/ui-shared.c b/ui-shared.c index 6cb7edb..3a9e67b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -20,7 +20,7 @@ static char *http_date(time_t t) | |||
| 20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
| 21 | static char month[][4] = | 21 | static char month[][4] = |
| 22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
| 23 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 23 | "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; |
| 24 | struct tm *tm = gmtime(&t); | 24 | struct tm *tm = gmtime(&t); |
| 25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
| 26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |