Merge branch 'index-header'

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index a1e1acd7dda0bc5f254a9c1d0a5e21848003a71a..54b1813a882806c67b5afe9422fdae51737cd665 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -14,6 +14,7 @@ struct repoinfo *cgit_repo;
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
+char *cgit_index_header = NULL;
 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;
@@ -22,6 +23,8 @@ char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
+int cgit_enable_log_filecount  =  0;
+int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
@@ -30,6 +33,7 @@ int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 
 int cgit_max_msg_len = 60;
+int cgit_max_repodesc_len = 60;
 int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
@@ -84,6 +88,8 @@ struct repoinfo *add_repo(const char *url)
        ret->owner = NULL;
        ret->defbranch = "master";
        ret->snapshots = cgit_snapshots;
+       ret->enable_log_filecount = cgit_enable_log_filecount;
+       ret->enable_log_linecount = cgit_enable_log_linecount;
        ret->module_link = cgit_module_link;
        return ret;
 }
@@ -96,6 +102,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_css = xstrdup(value);
        else if (!strcmp(name, "logo"))
                cgit_logo = xstrdup(value);
+       else if (!strcmp(name, "index-header"))
+               cgit_index_header = xstrdup(value);
        else if (!strcmp(name, "logo-link"))
                cgit_logo_link = xstrdup(value);
        else if (!strcmp(name, "module-link"))
@@ -106,6 +114,10 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
                cgit_snapshots = atoi(value);
+       else if (!strcmp(name, "enable-log-filecount"))
+               cgit_enable_log_filecount = atoi(value);
+       else if (!strcmp(name, "enable-log-linecount"))
+               cgit_enable_log_linecount = atoi(value);
        else if (!strcmp(name, "cache-root"))
                cgit_cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
@@ -118,6 +130,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-repodesc-length"))
+               cgit_max_repodesc_len = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                cgit_max_commit_count = atoi(value);
        else if (!strcmp(name, "repo.url"))
@@ -133,7 +147,11 @@ void cgit_global_config_cb(const char *name, const char *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);
+               cgit_repo->snapshots = cgit_snapshots * atoi(value);
+       else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
+               cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
+       else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
+               cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
        else if (cgit_repo && !strcmp(name, "repo.module-link"))
                cgit_repo->module_link= xstrdup(value);
        else if (!strcmp(name, "include"))