author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
commit | e633ccf714eb423c4522924c3b611dac2e176c5e (patch) (side-by-side diff) | |
tree | 096e7acc625b790e6860fe446f56775d578b60ff | |
parent | 59310ab102a448d90c337b3b138dd53681d8097e (diff) | |
parent | 21f67e7d82986135922aece6b4ebf410a98705bc (diff) | |
download | cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.zip cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.gz cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | shared.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -379,44 +379,46 @@ int cgit_open_filter(struct cgit_filter *filter) chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), "Unable to use pipe as STDOUT"); close(filter->pipe_fh[1]); return 0; } int cgit_close_filter(struct cgit_filter *filter) { chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), "Unable to restore STDOUT"); close(filter->old_stdout); if (filter->pid < 0) 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); } |