Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -400,25 +400,18 @@ int cgit_close_filter(struct cgit_filter *filter) */ int readfile(const char *path, char **buf, size_t *size) { - int fd, e; + int fd; struct stat st; fd = open(path, O_RDONLY); if (fd == -1) return errno; - if (fstat(fd, &st)) { - e = errno; - close(fd); - return e; - } - if (!S_ISREG(st.st_mode)) { - close(fd); + if (fstat(fd, &st)) + return errno; + if (!S_ISREG(st.st_mode)) return EISDIR; - } *buf = xmalloc(st.st_size + 1); *size = read_in_full(fd, *buf, st.st_size); - e = errno; (*buf)[*size] = '\0'; - close(fd); - return (*size == st.st_size ? 0 : e); + return (*size == st.st_size ? 0 : errno); } |