diff options
author | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
commit | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (patch) | |
tree | 2be5d6faa22089f8d1b0c1d7e14f283550130370 /filter.c | |
parent | e4803632f41cc3f09af6a88511b1d6359be3d325 (diff) | |
parent | 33414d7869aa55aaccd45cdb82268d454cb79863 (diff) | |
download | cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.gz cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.xz |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'filter.c')
-rw-r--r-- | filter.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -42,6 +42,7 @@ void cgit_cleanup_filters(void) static int open_exec_filter(struct cgit_filter *base, va_list ap) { struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base; + int pipe_fh[2]; int i; for (i = 0; i < filter->base.argument_count; i++) @@ -49,19 +50,19 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap) filter->old_stdout = chk_positive(dup(STDOUT_FILENO), "Unable to duplicate STDOUT"); - chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); + chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess"); filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); if (filter->pid == 0) { - close(filter->pipe_fh[1]); - chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), + close(pipe_fh[1]); + chk_non_negative(dup2(pipe_fh[0], STDIN_FILENO), "Unable to use pipe as STDIN"); execvp(filter->cmd, filter->argv); die_errno("Unable to exec subprocess %s", filter->cmd); } - close(filter->pipe_fh[0]); - chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), + close(pipe_fh[0]); + chk_non_negative(dup2(pipe_fh[1], STDOUT_FILENO), "Unable to use pipe as STDOUT"); - close(filter->pipe_fh[1]); + close(pipe_fh[1]); return 0; } |