diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2011-06-06 19:29:58 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-13 23:03:46 +0000 |
| commit | 3ec6b309505dc5f7ba14abe8861b02da34a9df0b (patch) | |
| tree | 4dda97c3b85d8103f05332677c6e0a15113f3cf3 /shared.c | |
| parent | b88cda6e5b4472fc1bb0ae00d9fb974ec4f61d7a (diff) | |
| download | cgit-3ec6b309505dc5f7ba14abe8861b02da34a9df0b.tar.gz cgit-3ec6b309505dc5f7ba14abe8861b02da34a9df0b.tar.bz2 | |
cgit.c: always setup cgit repo environment variables
When cgit learned to setup environment variables for certain repo
settings before invoking a filter process, the setup occurred inside
cgit_open_filter().
This patch moves the setup out of cgit_open_filter() and into
prepare_repo_cmd() to prepare for additional uses of these variables.
Reviewed-by: Ferry Huberts <mailings@hupie.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -374,7 +374,8 @@ typedef struct { char * value; } cgit_env_var; -static void prepare_env(struct cgit_repo * repo) { +void cgit_prepare_repo_env(struct cgit_repo * repo) +{ cgit_env_var env_vars[] = { { .name = "CGIT_REPO_URL", .value = repo->url }, { .name = "CGIT_REPO_NAME", .value = repo->name }, @@ -395,7 +396,7 @@ static void prepare_env(struct cgit_repo * repo) { fprintf(stderr, warn, p->name, p->value); } -int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo) +int cgit_open_filter(struct cgit_filter *filter) { filter->old_stdout = chk_positive(dup(STDOUT_FILENO), @@ -406,8 +407,6 @@ int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo) close(filter->pipe_fh[1]); chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), "Unable to use pipe as STDIN"); - if (repo) - prepare_env(repo); execvp(filter->cmd, filter->argv); die("Unable to exec subprocess %s: %s (%d)", filter->cmd, strerror(errno), errno); |