shared.c: use execvp() to execute filter commands

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index b42c2a2fdd829c635439b568076c4462222aad7a..986f965dc872d784b8b96f27003630fd6971933d 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include <stdio.h>
+#include <linux/limits.h>

 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;


@@ -56,13 +58,14 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->section = ctx.cfg.section;
        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;
        ret->section = ctx.cfg.section;
        ret->defbranch = "master";
        ret->snapshots = ctx.cfg.snapshots;

+       ret->enable_commit_graph = ctx.cfg.enable_commit_graph;

        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;

-       ret->readme = NULL;
+       ret->readme = ctx.cfg.readme;

        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;


@@ -338,13 +341,13 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        diff_flush(&opt);
 }
 
        diff_flush(&opt);
 }
 

-void cgit_diff_commit(struct commit *commit, filepair_fn fn)
+void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)

 {
        unsigned char *old_sha1 = NULL;
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;
 {
        unsigned char *old_sha1 = NULL;
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;

-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,

                       ctx.qry.ignorews);
 }
 
                       ctx.qry.ignorews);
 }
 


@@ -375,7 +378,33 @@ int cgit_parse_snapshots_mask(const char *str)
        return rv;
 }
 
        return rv;
 }
 

-int cgit_open_filter(struct cgit_filter *filter)
+typedef struct {
+       char * name;
+       char * value;
+} cgit_env_var;
+
+static void prepare_env(struct cgit_repo * repo) {
+       cgit_env_var env_vars[] = {
+               { .name = "CGIT_REPO_URL", .value = repo->url },
+               { .name = "CGIT_REPO_NAME", .value = repo->name },
+               { .name = "CGIT_REPO_PATH", .value = repo->path },
+               { .name = "CGIT_REPO_OWNER", .value = repo->owner },
+               { .name = "CGIT_REPO_DEFBRANCH", .value = repo->defbranch },
+               { .name = "CGIT_REPO_SECTION", .value = repo->section },
+               { .name = "CGIT_REPO_CLONE_URL", .value = repo->clone_url }
+       };
+       int env_var_count = ARRAY_SIZE(env_vars);
+       cgit_env_var *p, *q;
+       static char *warn = "cgit warning: failed to set env: %s=%s\n";
+
+       p = env_vars;
+       q = p + env_var_count;
+       for (; p < q; p++)
+               if (setenv(p->name, p->value, 1))
+                       fprintf(stderr, warn, p->name, p->value);
+}
+
+int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)

 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),


@@ -386,6 +415,8 @@ int cgit_open_filter(struct cgit_filter *filter)
                close(filter->pipe_fh[1]);
                chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
                        "Unable to use pipe as STDIN");
                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);
                execvp(filter->cmd, filter->argv);
                die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
                        strerror(errno), errno);