| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | shared.c | 7 |
2 files changed, 4 insertions, 4 deletions
@@ -62,6 +62,7 @@ struct cgit_filter { int old_stdout; int pipe_fh[2]; int pid; + int exitstatus; }; struct cgit_repo { @@ -459,6 +459,7 @@ void cgit_prepare_repo_env(struct cgit_repo * repo) int cgit_open_filter(struct cgit_filter *filter) { + filter->old_stdout = chk_positive(dup(STDOUT_FILENO), "Unable to duplicate STDOUT"); chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); @@ -479,15 +480,13 @@ int cgit_open_filter(struct cgit_filter *filter) int cgit_close_filter(struct cgit_filter *filter) { - int exit_status; - 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, &exit_status, 0); - if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status)) + waitpid(filter->pid, &filter->exitstatus, 0); + if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) return 0; die("Subprocess %s exited abnormally", filter->cmd); } |