mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2009-11-07 18:16:50 +01:00
commit e633ccf714
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared.c
View File

@ -400,15 +400,16 @@ int cgit_close_filter(struct cgit_filter *filter)
*/ */
int readfile(const char *path, char **buf, size_t *size) int readfile(const char *path, char **buf, size_t *size)
{ {
int fd; int fd, e;
struct stat st; struct stat st;
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)) {
e = errno;
close(fd); close(fd);
return errno; return e;
} }
if (!S_ISREG(st.st_mode)) { if (!S_ISREG(st.st_mode)) {
close(fd); close(fd);
@ -416,7 +417,8 @@ int readfile(const char *path, char **buf, size_t *size)
} }
*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);
e = errno;
(*buf)[*size] = '\0'; (*buf)[*size] = '\0';
close(fd); close(fd);
return (*size == st.st_size ? 0 : errno); return (*size == st.st_size ? 0 : e);
} }