-rw-r--r-- | shared.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -391,32 +391,34 @@ int cgit_close_filter(struct cgit_filter *filter) return 0; waitpid(filter->pid, &filter->exitstatus, 0); if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) return 0; die("Subprocess %s exited abnormally", filter->cmd); } /* Read the content of the specified file into a newly allocated buffer, * zeroterminate the buffer and return 0 on success, errno otherwise. */ 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)) { + e = errno; close(fd); - return errno; + 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'; close(fd); - return (*size == st.st_size ? 0 : errno); + return (*size == st.st_size ? 0 : e); } |