X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/f04b8d5c99afdc55178f1a06ff1594f5f0cc4be6..4046e8ef66225928a4f0d2cd71479e401faf7c3b:/shared.c?ds=inline diff --git a/shared.c b/shared.c index 01197f1..8ed14c0 100644 --- a/shared.c +++ b/shared.c @@ -71,6 +71,7 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->about_filter = ctx.cfg.about_filter; ret->commit_filter = ctx.cfg.commit_filter; ret->source_filter = ctx.cfg.source_filter; + ret->email_filter = ctx.cfg.email_filter; ret->clone_url = ctx.cfg.clone_url; ret->submodules.strdup_strings = 1; return ret; @@ -367,6 +368,7 @@ void cgit_diff_tree(const unsigned char *old_sha1, struct diff_options opt; struct pathspec_item item; + memset(&item, 0, sizeof(item)); diff_setup(&opt); opt.output_format = DIFF_FORMAT_CALLBACK; opt.detect_rename = 1; @@ -457,40 +459,6 @@ void cgit_prepare_repo_env(struct cgit_repo * repo) fprintf(stderr, warn, p->name, p->value); } -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"); - 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), - "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), - "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. */