Layout update

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 8e6df31213e89af5623d9f5c034275d9adad7308..531d8c0fdd9bd47a9488cee364b036447ae80d4e 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -8,7 +8,9 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-char *cgit_root         = "/usr/src/git";
+struct repolist cgit_repolist;
+struct repoinfo *cgit_repo;
+

 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";


@@ -18,6 +20,7 @@ char *cgit_virtual_root = NULL;
 char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
 char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;

+int cgit_snapshots             =  0;

 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;


@@ -42,15 +45,52 @@ char *cgit_query_search = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;

+char *cgit_query_name   = NULL;

 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 
 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 

+int chk_zero(int result, char *msg)
+{
+       if (result != 0)
+               die("%s: %s", msg, strerror(errno));
+       return result;
+}
+
+int chk_positive(int result, char *msg)
+{
+       if (result <= 0)
+               die("%s: %s", msg, strerror(errno));
+       return result;
+}
+
+struct repoinfo *add_repo(const char *url)
+{
+       struct repoinfo *ret;
+
+       if (++cgit_repolist.count > cgit_repolist.length) {
+               if (cgit_repolist.length == 0)
+                       cgit_repolist.length = 8;
+               else
+                       cgit_repolist.length *= 2;
+               cgit_repolist.repos = xrealloc(cgit_repolist.repos, 
+                                              cgit_repolist.length * 
+                                              sizeof(struct repoinfo));
+       }
+
+       ret = &cgit_repolist.repos[cgit_repolist.count-1];
+       ret->url = xstrdup(url);
+       ret->name = ret->url;
+       ret->path = NULL;
+       ret->desc = NULL;
+       ret->owner = NULL;
+       ret->snapshots = cgit_snapshots;
+       return ret;
+}
+

 void cgit_global_config_cb(const char *name, const char *value)
 {
 void cgit_global_config_cb(const char *name, const char *value)
 {

-       if (!strcmp(name, "root"))
-               cgit_root = xstrdup(value);
-       else if (!strcmp(name, "root-title"))
+       if (!strcmp(name, "root-title"))

                cgit_root_title = xstrdup(value);
        else if (!strcmp(name, "css"))
                cgit_css = xstrdup(value);
                cgit_root_title = xstrdup(value);
        else if (!strcmp(name, "css"))
                cgit_css = xstrdup(value);


@@ -62,6 +102,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_virtual_root = xstrdup(value);
        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
                cgit_virtual_root = xstrdup(value);
        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);

+       else if (!strcmp(name, "snapshots"))
+               cgit_snapshots = atoi(value);

        else if (!strcmp(name, "cache-root"))
                cgit_cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
        else if (!strcmp(name, "cache-root"))
                cgit_cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))


@@ -74,6 +116,18 @@ 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);
                cgit_cache_dynamic_ttl = atoi(value);
        else if (!strcmp(name, "max-message-length"))
                cgit_max_msg_len = atoi(value);

+       else if (!strcmp(name, "repo.url"))
+               cgit_repo = add_repo(value);
+       else if (!strcmp(name, "repo.name"))
+               cgit_repo->name = xstrdup(value);
+       else if (cgit_repo && !strcmp(name, "repo.path"))
+               cgit_repo->path = xstrdup(value);
+       else if (cgit_repo && !strcmp(name, "repo.desc"))
+               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.snapshots"))
+               cgit_repo->snapshots = atoi(value);

 }
 
 void cgit_repo_config_cb(const char *name, const char *value)
 }
 
 void cgit_repo_config_cb(const char *name, const char *value)


@@ -107,6 +161,8 @@ void cgit_querystring_cb(const char *name, const char *value)
                cgit_query_ofs = atoi(value);
        } else if (!strcmp(name, "path")) {
                cgit_query_path = xstrdup(value);
                cgit_query_ofs = atoi(value);
        } else if (!strcmp(name, "path")) {
                cgit_query_path = xstrdup(value);

+       } else if (!strcmp(name, "name")) {
+               cgit_query_name = xstrdup(value);

        }
 }
 
        }
 }