Use GIT-1.5.4.rc4

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index ff600db498a77664e1effa628bf7272e39c385e9..f06389471e132197f8be54d4d1ae4825f3957023 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -18,6 +18,7 @@ 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_index_info   = 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_agefile      = "info/web/last-modified";
@@ -25,6 +26,8 @@ char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = CGIT_CACHE_ROOT;
 char *cgit_repo_group   = NULL;
+char *cgit_robots       = "index, nofollow";
+char *cgit_clone_prefix = NULL;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
@@ -54,6 +57,7 @@ char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;
+char *cgit_query_grep   = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;
@@ -66,7 +70,7 @@ int htmlfd = 0;
 int cgit_get_cmd_index(const char *cmd)
 {
        static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
-                              "snapshot", "tag", NULL};
+                              "snapshot", "tag", "refs", "patch", NULL};
        int i;
 
        for(i = 0; cmds[i]; i++)
@@ -114,7 +118,7 @@ struct repoinfo *add_repo(const char *url)
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
-       ret->desc = NULL;
+       ret->desc = "[no description]";
        ret->owner = NULL;
        ret->group = cgit_repo_group;
        ret->defbranch = "master";
@@ -149,13 +153,17 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
                cgit_index_header = xstrdup(value);
+       else if (!strcmp(name, "index-info"))
+               cgit_index_info = xstrdup(value);
        else if (!strcmp(name, "logo-link"))
                cgit_logo_link = xstrdup(value);
        else if (!strcmp(name, "module-link"))
                cgit_module_link = xstrdup(value);
-       else if (!strcmp(name, "virtual-root"))
+       else if (!strcmp(name, "virtual-root")) {
                cgit_virtual_root = trim_end(value, '/');
-       else if (!strcmp(name, "nocache"))
+               if (!cgit_virtual_root && (!strcmp(value, "/")))
+                       cgit_virtual_root = "";
+       } else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
                cgit_snapshots = cgit_parse_snapshots_mask(value);
@@ -191,6 +199,10 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_agefile = xstrdup(value);
        else if (!strcmp(name, "renamelimit"))
                cgit_renamelimit = atoi(value);
+       else if (!strcmp(name, "robots"))
+               cgit_robots = xstrdup(value);
+       else if (!strcmp(name, "clone-prefix"))
+               cgit_clone_prefix = xstrdup(value);
        else if (!strcmp(name, "repo.group"))
                cgit_repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
@@ -199,6 +211,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_repo->name = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.path"))
                cgit_repo->path = trim_end(value, '/');
+       else if (cgit_repo && !strcmp(name, "repo.clone-url"))
+               cgit_repo->clone_url = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.desc"))
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))
@@ -232,6 +246,8 @@ void cgit_querystring_cb(const char *name, const char *value)
                cgit_cmd = cgit_get_cmd_index(value);
        } else if (!strcmp(name, "url")) {
                cgit_parse_url(value);
+       } else if (!strcmp(name, "qt")) {
+               cgit_query_grep = xstrdup(value);
        } else if (!strcmp(name, "q")) {
                cgit_query_search = xstrdup(value);
        } else if (!strcmp(name, "h")) {
@@ -259,6 +275,8 @@ void *cgit_free_commitinfo(struct commitinfo *info)
        free(info->committer);
        free(info->committer_email);
        free(info->subject);
+       free(info->msg);
+       free(info->msg_encoding);
        free(info);
        return NULL;
 }
@@ -297,6 +315,37 @@ char *trim_end(const char *str, char c)
        return s;
 }
 
+char *strlpart(char *txt, int maxlen)
+{
+       char *result;
+
+       if (!txt)
+               return txt;
+
+       if (strlen(txt) <= maxlen)
+               return txt;
+       result = xmalloc(maxlen + 1);
+       memcpy(result, txt, maxlen - 3);
+       result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
+       result[maxlen] = '\0';
+       return result;
+}
+
+char *strrpart(char *txt, int maxlen)
+{
+       char *result;
+
+       if (!txt)
+               return txt;
+
+       if (strlen(txt) <= maxlen)
+               return txt;
+       result = xmalloc(maxlen + 1);
+       memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
+       result[0] = result[1] = result[2] = '.';
+       return result;
+}
+
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)
 {
        size_t size;
@@ -443,7 +492,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = cgit_renamelimit;
-       opt.recursive = 1;
+       DIFF_OPT_SET(&opt, RECURSIVE);
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {