Be prepared for empty repositories

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 38b0ba5d0616d29f291a9017ec59cac5522cf4ff..cefeddfa12fb30d1c2711a79919aebb183ed5382 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -19,8 +19,16 @@ void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
 {
        if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);

+       else if (!strcmp(name, "root-desc"))
+               ctx.cfg.root_desc = xstrdup(value);
+       else if (!strcmp(name, "root-readme"))
+               ctx.cfg.root_readme = xstrdup(value);

        else if (!strcmp(name, "css"))
                ctx.cfg.css = 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"))
        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))


@@ -45,6 +53,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);

+       else if (!strcmp(name, "cache-size"))
+               ctx.cfg.cache_size = atoi(value);

        else if (!strcmp(name, "cache-root"))
                ctx.cfg.cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
        else if (!strcmp(name, "cache-root"))
                ctx.cfg.cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))


@@ -59,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);
                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"))
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))


@@ -136,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);
                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);

        }
 }
 
        }
 }
 


@@ -143,6 +157,8 @@ static void prepare_context(struct cgit_context *ctx)
 {
        memset(ctx, 0, sizeof(ctx));
        ctx->cfg.agefile = "info/web/last-modified";
 {
        memset(ctx, 0, sizeof(ctx));
        ctx->cfg.agefile = "info/web/last-modified";

+       ctx->cfg.nocache = 0;
+       ctx->cfg.cache_size = 0;

        ctx->cfg.cache_dynamic_ttl = 5;
        ctx->cfg.cache_max_create_time = 5;
        ctx->cfg.cache_repo_ttl = 5;
        ctx->cfg.cache_dynamic_ttl = 5;
        ctx->cfg.cache_max_create_time = 5;
        ctx->cfg.cache_repo_ttl = 5;


@@ -151,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.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;
        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
        ctx->cfg.max_msg_len = 60;


@@ -159,51 +176,13 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.renamelimit = -1;
        ctx->cfg.robots = "index, nofollow";
        ctx->cfg.root_title = "Git repository browser";
        ctx->cfg.renamelimit = -1;
        ctx->cfg.robots = "index, nofollow";
        ctx->cfg.root_title = "Git repository browser";

+       ctx->cfg.root_desc = "a fast webinterface for the git dscm";

        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
        ctx->page.mimetype = "text/html";
        ctx->page.charset = PAGE_ENCODING;
        ctx->page.filename = NULL;
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
        ctx->page.mimetype = "text/html";
        ctx->page.charset = PAGE_ENCODING;
        ctx->page.filename = NULL;

-}
-
-static int cgit_prepare_cache(struct cacheitem *item)
-{
-       if (!ctx.repo && ctx.qry.repo) {
-               ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
-                                     "Bad request");
-               cgit_print_http_headers(&ctx);
-               cgit_print_docstart(&ctx);
-               cgit_print_pageheader(&ctx);
-               cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
-               cgit_print_docend();
-               return 0;
-       }
-
-       if (!ctx.repo) {
-               item->name = xstrdup(fmt("%s/index.%s.html",
-                                        ctx.cfg.cache_root,
-                                        cache_safe_filename(ctx.qry.raw)));
-               item->ttl = ctx.cfg.cache_root_ttl;
-               return 1;
-       }
-
-       if (!ctx.qry.page) {
-               item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
-                                        cache_safe_filename(ctx.repo->url),
-                                        cache_safe_filename(ctx.qry.raw)));
-               item->ttl = ctx.cfg.cache_repo_ttl;
-       } else {
-               item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
-                                        cache_safe_filename(ctx.repo->url),
-                                        ctx.qry.page,
-                                        cache_safe_filename(ctx.qry.raw)));
-               if (ctx.qry.has_symref)
-                       item->ttl = ctx.cfg.cache_dynamic_ttl;
-               else if (ctx.qry.has_sha1)
-                       item->ttl = ctx.cfg.cache_static_ttl;
-               else
-                       item->ttl = ctx.cfg.cache_repo_ttl;
-       }
-       return 1;
+       ctx->page.modified = time(NULL);
+       ctx->page.expires = ctx->page.modified;

 }
 
 struct refmatch {
 }
 
 struct refmatch {


@@ -228,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 *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)
 
        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
        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)
 }
 
 static int prepare_repo_cmd(struct cgit_context *ctx)


@@ -262,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->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;
        }
 
                ctx->repo->defbranch = ctx->qry.head;
        }
 


@@ -288,8 +271,9 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        return 0;
 }
 
        return 0;
 }
 

-static void process_request(struct cgit_context *ctx)
+static void process_request(void *cbdata)

 {
 {

+       struct cgit_context *ctx = cbdata;

        struct cgit_cmd *cmd;
 
        cmd = cgit_get_cmd(ctx);
        struct cgit_cmd *cmd;
 
        cmd = cgit_get_cmd(ctx);


@@ -304,7 +288,16 @@ static void process_request(struct cgit_context *ctx)
                return;
        }
 
                return;
        }
 

-       if (cmd->want_repo && prepare_repo_cmd(ctx))
+       if (cmd->want_repo && !ctx->repo) {
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error(fmt("No repository selected"));
+               cgit_print_docend();
+               return;
+       }
+
+       if (ctx->repo && prepare_repo_cmd(ctx))

                return;
 
        if (cmd->want_layout) {
                return;
 
        if (cmd->want_layout) {


@@ -319,82 +312,6 @@ static void process_request(struct cgit_context *ctx)
                cgit_print_docend();
 }
 
                cgit_print_docend();
 }
 

-static long ttl_seconds(long ttl)
-{
-       if (ttl<0)
-               return 60 * 60 * 24 * 365;
-       else
-               return ttl * 60;
-}
-
-static void cgit_fill_cache(struct cacheitem *item, int use_cache)
-{
-       int stdout2;
-
-       if (use_cache) {
-               stdout2 = chk_positive(dup(STDOUT_FILENO),
-                                      "Preserving STDOUT");
-               chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
-               chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
-       }
-
-       ctx.page.modified = time(NULL);
-       ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
-       process_request(&ctx);
-
-       if (use_cache) {
-               chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
-               chk_positive(dup2(stdout2, STDOUT_FILENO),
-                            "Restoring original STDOUT");
-               chk_zero(close(stdout2), "Closing temporary STDOUT");
-       }
-}
-
-static void cgit_check_cache(struct cacheitem *item)
-{
-       int i = 0;
-
- top:
-       if (++i > ctx.cfg.max_lock_attempts) {
-               die("cgit_refresh_cache: unable to lock %s: %s",
-                   item->name, strerror(errno));
-       }
-       if (!cache_exist(item)) {
-               if (!cache_lock(item)) {
-                       sleep(1);
-                       goto top;
-               }
-               if (!cache_exist(item)) {
-                       cgit_fill_cache(item, 1);
-                       cache_unlock(item);
-               } else {
-                       cache_cancel_lock(item);
-               }
-       } else if (cache_expired(item) && cache_lock(item)) {
-               if (cache_expired(item)) {
-                       cgit_fill_cache(item, 1);
-                       cache_unlock(item);
-               } else {
-                       cache_cancel_lock(item);
-               }
-       }
-}
-
-static void cgit_print_cache(struct cacheitem *item)
-{
-       static char buf[4096];
-       ssize_t i;
-
-       int fd = open(item->name, O_RDONLY);
-       if (fd<0)
-               die("Unable to open cached file %s", item->name);
-
-       while((i=read(fd, buf, sizeof(buf))) > 0)
-               write(STDOUT_FILENO, buf, i);
-
-       close(fd);
-}
-

 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;
 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;


@@ -429,13 +346,29 @@ static void cgit_parse_args(int argc, const char **argv)
        }
 }
 
        }
 }
 

+static int calc_ttl()
+{
+       if (!ctx.repo)
+               return ctx.cfg.cache_root_ttl;
+
+       if (!ctx.qry.page)
+               return ctx.cfg.cache_repo_ttl;
+
+       if (ctx.qry.has_symref)
+               return ctx.cfg.cache_dynamic_ttl;
+
+       if (ctx.qry.has_sha1)
+               return ctx.cfg.cache_static_ttl;
+
+       return ctx.cfg.cache_repo_ttl;
+}
+

 int main(int argc, const char **argv)
 {
 int main(int argc, const char **argv)
 {

-       struct cacheitem item;

        const char *cgit_config_env = getenv("CGIT_CONFIG");
        const char *cgit_config_env = getenv("CGIT_CONFIG");

+       int err, ttl;

 
        prepare_context(&ctx);
 
        prepare_context(&ctx);

-       item.st.st_mtime = time(NULL);

        cgit_repolist.length = 0;
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
        cgit_repolist.length = 0;
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;


@@ -449,13 +382,15 @@ int main(int argc, const char **argv)
                ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);
        http_parse_querystring(ctx.qry.raw, querystring_cb);
                ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);
        http_parse_querystring(ctx.qry.raw, querystring_cb);

-       if (!cgit_prepare_cache(&item))
-               return 0;
-       if (ctx.cfg.nocache) {
-               cgit_fill_cache(&item, 0);
-       } else {
-               cgit_check_cache(&item);
-               cgit_print_cache(&item);
-       }
-       return 0;
+
+       ttl = calc_ttl();
+       ctx.page.expires += ttl*60;
+       if (ctx.cfg.nocache)
+               ctx.cfg.cache_size = 0;
+       err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
+                           ctx.qry.raw, ttl, process_request, &ctx);
+       if (err)
+               cgit_print_error(fmt("Error processing page: %s (%d)",
+                                    strerror(err), err));
+       return err;

 }
 }