Make git_pageurl handle NULL querystrings

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 801f68d59e4337de3b14c2534a446b92ebe787fa..a1e1acd7dda0bc5f254a9c1d0a5e21848003a71a 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -17,7 +17,7 @@ char *cgit_logo         = "/git-logo.png";
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_virtual_root = NULL;
-
+char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
@@ -30,10 +30,7 @@ int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 
 int cgit_max_msg_len = 60;
-
-char *cgit_repo_name    = NULL;
-char *cgit_repo_desc    = NULL;
-char *cgit_repo_owner   = NULL;
+int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
@@ -85,6 +82,7 @@ struct repoinfo *add_repo(const char *url)
        ret->path = NULL;
        ret->desc = NULL;
        ret->owner = NULL;
+       ret->defbranch = "master";
        ret->snapshots = cgit_snapshots;
        ret->module_link = cgit_module_link;
        return ret;
@@ -120,6 +118,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_cache_dynamic_ttl = atoi(value);
        else if (!strcmp(name, "max-message-length"))
                cgit_max_msg_len = atoi(value);
+       else if (!strcmp(name, "max-commit-count"))
+               cgit_max_commit_count = atoi(value);
        else if (!strcmp(name, "repo.url"))
                cgit_repo = add_repo(value);
        else if (!strcmp(name, "repo.name"))
@@ -130,20 +130,14 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))
                cgit_repo->owner = xstrdup(value);
+       else if (cgit_repo && !strcmp(name, "repo.defbranch"))
+               cgit_repo->defbranch = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.snapshots"))
                cgit_repo->snapshots = atoi(value);
        else if (cgit_repo && !strcmp(name, "repo.module-link"))
                cgit_repo->module_link= xstrdup(value);
-}
-
-void cgit_repo_config_cb(const char *name, const char *value)
-{
-       if (!strcmp(name, "name"))
-               cgit_repo_name = xstrdup(value);
-       else if (!strcmp(name, "desc"))
-               cgit_repo_desc = xstrdup(value);
-       else if (!strcmp(name, "owner"))
-               cgit_repo_owner = xstrdup(value);
+       else if (!strcmp(name, "include"))
+               cgit_read_config(value, cgit_global_config_cb);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)