scan-tree: Unify gitweb.* and cgit.* settings into one config option.

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index be2ae59e0a3fb764b8f3d6977189ff492d831a8c..3e20937a0ce7dbc568742a5d9cef8502d7dde406 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -8,7 +8,6 @@
 
 #include "cgit.h"
 #include <stdio.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;


@@ -34,6 +33,7 @@ int chk_non_negative(int result, char *msg)
        return result;
 }
 
        return result;
 }
 

+char *cgit_default_repo_desc = "[no description]";

 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;
 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;


@@ -53,10 +53,9 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;

-       ret->desc = "[no description]";
+       ret->desc = cgit_default_repo_desc;

        ret->owner = NULL;
        ret->section = ctx.cfg.section;
        ret->owner = NULL;
        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->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;


@@ -70,6 +69,8 @@ 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->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;

+       ret->clone_url = ctx.cfg.clone_url;
+       ret->submodules.strdup_strings = 1;

        return ret;
 }
 
        return ret;
 }
 


@@ -374,7 +375,8 @@ typedef struct {
        char * value;
 } cgit_env_var;
 
        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 },
        cgit_env_var env_vars[] = {
                { .name = "CGIT_REPO_URL", .value = repo->url },
                { .name = "CGIT_REPO_NAME", .value = repo->name },


@@ -391,11 +393,11 @@ static void prepare_env(struct cgit_repo * repo) {
        p = env_vars;
        q = p + env_var_count;
        for (; p < q; p++)
        p = env_vars;
        q = p + env_var_count;
        for (; p < q; p++)

-               if (setenv(p->name, p->value, 1))
+               if (p->value && setenv(p->name, p->value, 1))

                        fprintf(stderr, warn, p->name, p->value);
 }
 
                        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),
 {
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),


@@ -406,8 +408,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");
                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);