cgit_open_filter: hand down repo configuration to script

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index b42c2a2fdd829c635439b568076c4462222aad7a..8c3d18a8879ede816a7c8b191938d78a41d7a58d 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
+#include <stdio.h>
+#include <linux/limits.h>
 
 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->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->readme = NULL;
+       ret->readme = ctx.cfg.readme;
        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);
 }
 
-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;
-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
                       ctx.qry.ignorews);
 }
 
@@ -375,7 +378,71 @@ int cgit_parse_snapshots_mask(const char *str)
        return rv;
 }
 
-int cgit_open_filter(struct cgit_filter *filter)
+typedef struct {
+       char * name;
+       char * value;
+} cgit_env_var;
+
+static char * 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);
+       long values_space = (env_var_count * (PATH_MAX + 64));
+
+       void * buffer;
+       char ** vars;
+       char * values;
+       int vars_index = 0;
+       unsigned int chars_printed;
+
+       /* Allocate buffer for environment variables: first in the buffer is an
+        * array of pointers to argument strings, terminated with a NULL pointer.
+        * After that the argument strings are placed after each other */
+       buffer = malloc(((env_var_count + 1) * sizeof(char *)) + values_space);
+       if (!buffer)
+               return NULL;
+
+       vars = buffer;
+       values = (char *) &vars[env_var_count + 1];
+
+       /* loop over all defined environment variables and their values */
+       while (vars_index < env_var_count) {
+               char * name = env_vars[vars_index].name;
+               char * value = env_vars[vars_index].value;
+
+               if (!value)
+                       value = "";
+
+               chars_printed = snprintf(values, (values_space - 1), "%s=%s", name,
+                               value);
+               if (chars_printed > (values_space - 1)) {
+                       /* Buffer space exhausted: stop adding variables.
+                        * Not all environment variables are defined, but the best we can
+                        * do is to provide the ones that _are_ defined */
+                       break;
+               }
+
+               values[chars_printed] = '\0';
+               *&vars[vars_index] = values;
+               values += (chars_printed + 1);
+               values_space -= (chars_printed + 1);
+               vars_index++;
+       }
+
+       /* terminate the array with pointers */
+       *&vars[vars_index] = NULL;
+
+       return (char *) buffer;
+}
+
+int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
@@ -383,10 +450,20 @@ int cgit_open_filter(struct cgit_filter *filter)
        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) {
+               char * env = NULL;
+
                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);
+
+               if (repo)
+                       env = prepare_env(repo);
+
+               execve(filter->cmd, filter->argv, (char **)env);
+
+               if (env)
+                       free(env);
+
                die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
                        strerror(errno), errno);
        }