mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-10 02:28:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2009-11-07 15:35:36 +01:00
commit 4b1fee00dd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shared.c
View File

@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size)
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd == -1) if (fd == -1)
return errno; return errno;
if (fstat(fd, &st)) if (fstat(fd, &st)) {
close(fd);
return errno; return errno;
if (!S_ISREG(st.st_mode)) }
if (!S_ISREG(st.st_mode)) {
close(fd);
return EISDIR; return EISDIR;
}
*buf = xmalloc(st.st_size + 1); *buf = xmalloc(st.st_size + 1);
*size = read_in_full(fd, *buf, st.st_size); *size = read_in_full(fd, *buf, st.st_size);
(*buf)[*size] = '\0'; (*buf)[*size] = '\0';
close(fd);
return (*size == st.st_size ? 0 : errno); return (*size == st.st_size ? 0 : errno);
} }

2
ui-shared.c
View File

@ -20,7 +20,7 @@ static char *http_date(time_t t)
{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
static char month[][4] = static char month[][4] =
{"Jan", "Feb", "Mar", "Apr", "May", "Jun", {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
struct tm *tm = gmtime(&t); struct tm *tm = gmtime(&t);
return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 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, tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,