cgit v0.6.3

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index ab00bc93c36fec302ef9de8f00ac976dcd14298d..0fe513f4f24efc7796d3627e7743e952e323ed35 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -12,6 +12,8 @@ struct repolist cgit_repolist;
 struct repoinfo *cgit_repo;
 int cgit_cmd;
 
 struct repoinfo *cgit_repo;
 int cgit_cmd;
 

+const char *cgit_version = CGIT_VERSION;
+

 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";


@@ -21,7 +23,7 @@ char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;

-char *cgit_cache_root   = "/var/cache/cgit";
+char *cgit_cache_root   = CGIT_CACHE_ROOT;

 char *cgit_repo_group   = NULL;
 
 int cgit_nocache               =  0;
 char *cgit_repo_group   = NULL;
 
 int cgit_nocache               =  0;


@@ -61,7 +63,7 @@ int htmlfd = 0;
 int cgit_get_cmd_index(const char *cmd)
 {
        static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
 int cgit_get_cmd_index(const char *cmd)
 {
        static char *cmds[] = {"log", "commit", "diff", "tree", "blob",

-                              "snapshot", NULL};
+                              "snapshot", "tag", NULL};

        int i;
 
        for(i = 0; cmds[i]; i++)
        int i;
 
        for(i = 0; cmds[i]; i++)


@@ -84,6 +86,13 @@ int chk_positive(int result, char *msg)
        return result;
 }
 
        return result;
 }
 

+int chk_non_negative(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;
 struct repoinfo *add_repo(const char *url)
 {
        struct repoinfo *ret;


@@ -99,7 +108,7 @@ struct repoinfo *add_repo(const char *url)
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];

-       ret->url = xstrdup(url);
+       ret->url = trim_end(url, '/');

        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = NULL;
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = NULL;


@@ -142,11 +151,11 @@ void cgit_global_config_cb(const char *name, const char *value)
        else if (!strcmp(name, "module-link"))
                cgit_module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root"))
        else if (!strcmp(name, "module-link"))
                cgit_module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root"))

-               cgit_virtual_root = xstrdup(value);
+               cgit_virtual_root = trim_end(value, '/');

        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))

-               cgit_snapshots = atoi(value);
+               cgit_snapshots = cgit_parse_snapshots_mask(value);

        else if (!strcmp(name, "enable-index-links"))
                cgit_enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
        else if (!strcmp(name, "enable-index-links"))
                cgit_enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))


@@ -180,7 +189,7 @@ void cgit_global_config_cb(const char *name, const char *value)
        else if (!strcmp(name, "repo.name"))
                cgit_repo->name = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.path"))
        else if (!strcmp(name, "repo.name"))
                cgit_repo->name = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.path"))

-               cgit_repo->path = xstrdup(value);
+               cgit_repo->path = trim_end(value, '/');

        else if (cgit_repo && !strcmp(name, "repo.desc"))
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))
        else if (cgit_repo && !strcmp(name, "repo.desc"))
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))


@@ -188,7 +197,7 @@ 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"))
        else if (cgit_repo && !strcmp(name, "repo.defbranch"))
                cgit_repo->defbranch = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.snapshots"))

-               cgit_repo->snapshots = cgit_snapshots * atoi(value);
+               cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */

        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"))
        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"))


@@ -228,7 +237,7 @@ void cgit_querystring_cb(const char *name, const char *value)
        } else if (!strcmp(name, "ofs")) {
                cgit_query_ofs = atoi(value);
        } else if (!strcmp(name, "path")) {
        } else if (!strcmp(name, "ofs")) {
                cgit_query_ofs = atoi(value);
        } else if (!strcmp(name, "path")) {

-               cgit_query_path = xstrdup(value);
+               cgit_query_path = trim_end(value, '/');

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


@@ -257,6 +266,28 @@ int hextoint(char c)
                return -1;
 }
 
                return -1;
 }
 

+char *trim_end(const char *str, char c)
+{
+       int len;
+       char *s, *t;
+
+       if (str == NULL)
+               return NULL;
+       t = (char *)str;
+       len = strlen(t);
+       while(len > 0 && t[len - 1] == c)
+               len--;
+
+       if (len == 0)
+               return NULL;
+
+       c = t[len];
+       t[len] = '\0';
+       s = xstrdup(t);
+       t[len] = c;
+       return s;
+}
+

 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                       struct diff_options *options, void *data)
 {
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                       struct diff_options *options, void *data)
 {


@@ -277,7 +308,8 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

-               file->ptr = read_sha1_file(sha1, &type, &file->size);
+               file->ptr = read_sha1_file(sha1, &type, 
+                                          (unsigned long *)&file->size);

        }
        return 1;
 }
        }
        return 1;
 }


@@ -342,6 +374,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
        diff_params.flags = XDF_NEED_MINIMAL;
        emit_params.ctxlen = 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
        diff_params.flags = XDF_NEED_MINIMAL;
        emit_params.ctxlen = 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;

+       emit_params.find_func = NULL;

        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);