diff options
Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/shared.c b/shared.c index d7b2d5a..9362d21 100644 --- a/shared.c +++ b/shared.c @@ -400,18 +400,25 @@ int cgit_close_filter(struct cgit_filter *filter) */ int readfile(const char *path, char **buf, size_t *size) { - int fd; + int fd, e; struct stat st; fd = open(path, O_RDONLY); if (fd == -1) return errno; - if (fstat(fd, &st)) - return errno; - if (!S_ISREG(st.st_mode)) + if (fstat(fd, &st)) { + e = errno; + close(fd); + return e; + } + 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); + e = errno; (*buf)[*size] = '\0'; - return (*size == st.st_size ? 0 : errno); + close(fd); + return (*size == st.st_size ? 0 : e); } |