Be prepared for empty repositories

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index ccd61f48219e87d99963f113f394107124643332..cefeddfa12fb30d1c2711a79919aebb183ed5382 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -25,6 +25,10 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.root_readme = xstrdup(value);
        else if (!strcmp(name, "css"))
                ctx.cfg.css = xstrdup(value);
+       else if (!strcmp(name, "favicon"))
+               ctx.cfg.favicon = xstrdup(value);
+       else if (!strcmp(name, "footer"))
+               ctx.cfg.footer = xstrdup(value);
        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
@@ -65,6 +69,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.max_msg_len = atoi(value);
        else if (!strcmp(name, "max-repodesc-length"))
                ctx.cfg.max_repodesc_len = atoi(value);
+       else if (!strcmp(name, "max-repo-count"))
+               ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))
@@ -142,6 +148,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
+       } else if (!strcmp(name, "mimetype")) {
+               ctx.qry.mimetype = xstrdup(value);
        }
 }
 
@@ -159,6 +167,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/git-logo.png";
+       ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
        ctx->cfg.max_msg_len = 60;
@@ -198,15 +207,19 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
 char *find_default_branch(struct cgit_repo *repo)
 {
        struct refmatch info;
+       char *ref;
 
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;
        for_each_branch_ref(find_current_ref, &info);
        if (info.match)
-               return info.req_ref;
+               ref = info.req_ref;
        else
-               return info.first_ref;
+               ref = info.first_ref;
+       if (ref)
+               ref = xstrdup(ref);
+       return ref;
 }
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
@@ -232,7 +245,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {
-               ctx->qry.head = xstrdup(find_default_branch(ctx->repo));
+               ctx->qry.head = find_default_branch(ctx->repo);
                ctx->repo->defbranch = ctx->qry.head;
        }
 
@@ -377,7 +390,7 @@ int main(int argc, const char **argv)
        err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
                            ctx.qry.raw, ttl, process_request, &ctx);
        if (err)
-               cache_log("[cgit] error %d - %s\n",
-                         err, strerror(err));
+               cgit_print_error(fmt("Error processing page: %s (%d)",
+                                    strerror(err), err));
        return err;
 }