neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit fd069b4ca08cb46eb335a1434330b21fbaf84b9c
parent 9d751e7eec4f4bc7292be46f2af774fe1adf336a
Author: Jason A. Donenfeld <Jason@zx2c4.com>
Date:   Sat, 14 Oct 2017 16:13:07 +0200

filter: pipe_fh should be local

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Diffstat:
Mcgit.h | 1-
Mfilter.c | 13+++++++------
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cgit.h b/cgit.h @@ -71,7 +71,6 @@ struct cgit_exec_filter { char *cmd; char **argv; int old_stdout; - int pipe_fh[2]; int pid; }; diff --git a/filter.c b/filter.c @@ -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; }