Merge branch 'wip'

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index a8dda23a38836b788ddd5a82ca5af62972cbbe48..afafccee82f49639e191fd4c0c1a3d9b2aa027ee 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -18,7 +18,7 @@
 
 const char *cgit_version = CGIT_VERSION;
 
-void add_mimetype(const char *name, const char *value)
+static void add_mimetype(const char *name, const char *value)
 {
        struct string_list_item *item;
 
@@ -26,7 +26,7 @@ void add_mimetype(const char *name, const char *value)
        item->util = xstrdup(value);
 }
 
-struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
+static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 {
        struct cgit_filter *f;
        int args_size = 0;
@@ -58,7 +58,7 @@ struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
 static void process_cached_repolist(const char *path);
 
-void repo_config(struct cgit_repo *repo, const char *name, const char *value)
+static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 {
        struct string_list_item *item;
 
@@ -84,7 +84,12 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                repo->enable_remote_branches = atoi(value);
        else if (!strcmp(name, "enable-subject-links"))
                repo->enable_subject_links = atoi(value);
-       else if (!strcmp(name, "max-stats"))
+       else if (!strcmp(name, "commit-sort")) {
+               if (!strcmp(value, "date"))
+                       repo->commit_sort = 1;
+               if (!strcmp(value, "topo"))
+                       repo->commit_sort = 2;
+       } else if (!strcmp(name, "max-stats"))
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);
@@ -109,7 +114,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
        }
 }
 
-void config_cb(const char *name, const char *value)
+static void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                ctx.cfg.section = xstrdup(value);
@@ -163,14 +168,12 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);
-       else if (!strcmp(name, "enable-gitweb-desc"))
-               ctx.cfg.enable_gitweb_desc = atoi(value);
-       else if (!strcmp(name, "enable-gitweb-owner"))
-               ctx.cfg.enable_gitweb_owner = atoi(value);
        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
+       else if (!strcmp(name, "enable-index-owner"))
+               ctx.cfg.enable_index_owner = atoi(value);
        else if (!strcmp(name, "enable-commit-graph"))
                ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
@@ -183,6 +186,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_subject_links = atoi(value);
        else if (!strcmp(name, "enable-tree-linenumbers"))
                ctx.cfg.enable_tree_linenumbers = atoi(value);
+       else if (!strcmp(name, "enable-git-config"))
+               ctx.cfg.enable_git_config = atoi(value);
        else if (!strcmp(name, "max-stats"))
                ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "cache-size"))
@@ -235,6 +240,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.section_from_path = atoi(value);
        else if (!strcmp(name, "repository-sort"))
                ctx.cfg.repository_sort = xstrdup(value);
+       else if (!strcmp(name, "section-sort"))
+               ctx.cfg.section_sort = atoi(value);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, SOURCE);
        else if (!strcmp(name, "summary-log"))
@@ -261,7 +268,12 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.clone_url = xstrdup(value);
        else if (!strcmp(name, "local-time"))
                ctx.cfg.local_time = atoi(value);
-       else if (!prefixcmp(name, "mimetype."))
+       else if (!strcmp(name, "commit-sort")) {
+               if (!strcmp(value, "date"))
+                       ctx.cfg.commit_sort = 1;
+               if (!strcmp(value, "topo"))
+                       ctx.cfg.commit_sort = 2;
+       } else if (!prefixcmp(name, "mimetype."))
                add_mimetype(name + 9, value);
        else if (!strcmp(name, "include"))
                parse_configfile(expand_macros(value), config_cb);
@@ -303,7 +315,7 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);
-       } else if (!strcmp(name, "s")){
+       } else if (!strcmp(name, "s")) {
                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
                ctx.qry.showmsg = atoi(value);
@@ -321,7 +333,7 @@ static void querystring_cb(const char *name, const char *value)
        }
 }
 
-char *xstrdupn(const char *str)
+static char *xstrdupn(const char *str)
 {
        return (str ? xstrdup(str) : NULL);
 }
@@ -343,11 +355,10 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
-       ctx->cfg.enable_gitweb_desc = 1;
-       ctx->cfg.enable_gitweb_owner = 1;
-       ctx->cfg.enable_gitweb_section = 1;
        ctx->cfg.enable_http_clone = 1;
+       ctx->cfg.enable_index_owner = 1;
        ctx->cfg.enable_tree_linenumbers = 1;
+       ctx->cfg.enable_git_config = 0;
        ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
@@ -365,6 +376,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
        ctx->cfg.section = "";
        ctx->cfg.repository_sort = "name";
+       ctx->cfg.section_sort = 1;
        ctx->cfg.summary_branches = 10;
        ctx->cfg.summary_log = 10;
        ctx->cfg.summary_tags = 10;
@@ -402,8 +414,8 @@ struct refmatch {
        int match;
 };
 
-int find_current_ref(const char *refname, const unsigned char *sha1,
-                    int flags, void *cb_data)
+static int find_current_ref(const char *refname, const unsigned char *sha1,
+                           int flags, void *cb_data)
 {
        struct refmatch *info;
 
@@ -415,7 +427,13 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
        return info->match;
 }
 
-char *find_default_branch(struct cgit_repo *repo)
+static void free_refmatch_inner(struct refmatch *info)
+{
+       if (info->first_ref)
+               free(info->first_ref);
+}
+
+static char *find_default_branch(struct cgit_repo *repo)
 {
        struct refmatch info;
        char *ref;
@@ -430,15 +448,17 @@ char *find_default_branch(struct cgit_repo *repo)
                ref = info.first_ref;
        if (ref)
                ref = xstrdup(ref);
+       free_refmatch_inner(&info);
+
        return ref;
 }
 
-static char *guess_defbranch(const char *repo_path)
+static char *guess_defbranch(void)
 {
        const char *ref;
        unsigned char sha1[20];
 
-       ref = resolve_ref("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
        if (!ref || prefixcmp(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);
@@ -471,7 +491,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->repo->defbranch)
-               ctx->repo->defbranch = guess_defbranch(ctx->repo->path);
+               ctx->repo->defbranch = guess_defbranch();
 
        if (!ctx->qry.head) {
                ctx->qry.nohead = 1;
@@ -557,13 +577,13 @@ static void process_request(void *cbdata)
                cgit_print_docend();
 }
 
-int cmp_repos(const void *a, const void *b)
+static int cmp_repos(const void *a, const void *b)
 {
        const struct cgit_repo *ra = a, *rb = b;
        return strcmp(ra->url, rb->url);
 }
 
-char *build_snapshot_setting(int bitmap)
+static char *build_snapshot_setting(int bitmap)
 {
        const struct cgit_snapshot_format *f;
        char *result = xstrdup("");
@@ -583,7 +603,7 @@ char *build_snapshot_setting(int bitmap)
        return result;
 }
 
-char *get_first_line(char *txt)
+static char *get_first_line(char *txt)
 {
        char *t = xstrdup(txt);
        char *p = strchr(t, '\n');
@@ -592,7 +612,7 @@ char *get_first_line(char *txt)
        return t;
 }
 
-void print_repo(FILE *f, struct cgit_repo *repo)
+static void print_repo(FILE *f, struct cgit_repo *repo)
 {
        fprintf(f, "repo.url=%s\n", repo->url);
        fprintf(f, "repo.name=%s\n", repo->name);
@@ -637,11 +657,11 @@ void print_repo(FILE *f, struct cgit_repo *repo)
        fprintf(f, "\n");
 }
 
-void print_repolist(FILE *f, struct cgit_repolist *list, int start)
+static void print_repolist(FILE *f, struct cgit_repolist *list, int start)
 {
        int i;
 
-       for(i = start; i < list->count; i++)
+       for (i = start; i < list->count; i++)
                print_repo(f, &list->repos[i]);
 }
 
@@ -729,7 +749,7 @@ static void cgit_parse_args(int argc, const char **argv)
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {
-                       ctx.cfg.cache_root = xstrdup(argv[i]+8);
+                       ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                }
                if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
@@ -738,24 +758,24 @@ static void cgit_parse_args(int argc, const char **argv)
                        ctx.env.no_http = "1";
                }
                if (!strncmp(argv[i], "--query=", 8)) {
-                       ctx.qry.raw = xstrdup(argv[i]+8);
+                       ctx.qry.raw = xstrdup(argv[i] + 8);
                }
                if (!strncmp(argv[i], "--repo=", 7)) {
-                       ctx.qry.repo = xstrdup(argv[i]+7);
+                       ctx.qry.repo = xstrdup(argv[i] + 7);
                }
                if (!strncmp(argv[i], "--page=", 7)) {
-                       ctx.qry.page = xstrdup(argv[i]+7);
+                       ctx.qry.page = xstrdup(argv[i] + 7);
                }
                if (!strncmp(argv[i], "--head=", 7)) {
-                       ctx.qry.head = xstrdup(argv[i]+7);
+                       ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
                }
                if (!strncmp(argv[i], "--sha1=", 7)) {
-                       ctx.qry.sha1 = xstrdup(argv[i]+7);
+                       ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {
-                       ctx.qry.ofs = atoi(argv[i]+6);
+                       ctx.qry.ofs = atoi(argv[i] + 6);
                }
                if (!strncmp(argv[i], "--scan-tree=", 12) ||
                    !strncmp(argv[i], "--scan-path=", 12)) {
@@ -822,7 +842,7 @@ int main(int argc, const char **argv)
                ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
                if (!ctx.cfg.virtual_root)
                        ctx.cfg.virtual_root = "";
-        }
+       }
 
        /* If no url parameter is specified on the querystring, lets
         * use PATH_INFO as url. This allows cgit to work with virtual
@@ -844,7 +864,7 @@ int main(int argc, const char **argv)
        }
 
        ttl = calc_ttl();
-       ctx.page.expires += ttl*60;
+       ctx.page.expires += ttl * 60;
        if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
                ctx.cfg.nocache = 1;
        if (ctx.cfg.nocache)