Replace most uses of strncmp() with prefixcmp()

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 950b87834e81fdc5bb2210a6964499811b642096..e31962d43bc919c14e08f4ddbd4ff5e8cfc7a4b4 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -1,7 +1,6 @@
 /* cgit.c: cgi for the git scm
  *
- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -211,6 +210,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.cache_static_ttl = atoi(value);
        else if (!strcmp(name, "cache-dynamic-ttl"))
                ctx.cfg.cache_dynamic_ttl = atoi(value);
+       else if (!strcmp(name, "cache-about-ttl"))
+               ctx.cfg.cache_about_ttl = atoi(value);
        else if (!strcmp(name, "case-sensitive-sort"))
                ctx.cfg.case_sensitive_sort = atoi(value);
        else if (!strcmp(name, "about-filter"))
@@ -351,12 +352,13 @@ static void prepare_context(struct cgit_context *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_root = CGIT_CACHE_ROOT;
+       ctx->cfg.cache_about_ttl = 15;
+       ctx->cfg.cache_repo_ttl = 5;
        ctx->cfg.cache_root_ttl = 5;
        ctx->cfg.cache_scanrc_ttl = 15;
+       ctx->cfg.cache_dynamic_ttl = 5;
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.case_sensitive_sort = 1;
        ctx->cfg.branch_sort = 0;
@@ -861,7 +863,7 @@ static void cgit_parse_args(int argc, const char **argv)
        int scan = 0;
 
        for (i = 1; i < argc; i++) {
-               if (!strncmp(argv[i], "--cache=", 8)) {
+               if (!prefixcmp(argv[i], "--cache=")) {
                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
                }
                if (!strcmp(argv[i], "--nocache")) {
@@ -870,28 +872,28 @@ static void cgit_parse_args(int argc, const char **argv)
                if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
                }
-               if (!strncmp(argv[i], "--query=", 8)) {
+               if (!prefixcmp(argv[i], "--query=")) {
                        ctx.qry.raw = xstrdup(argv[i] + 8);
                }
-               if (!strncmp(argv[i], "--repo=", 7)) {
+               if (!prefixcmp(argv[i], "--repo=")) {
                        ctx.qry.repo = xstrdup(argv[i] + 7);
                }
-               if (!strncmp(argv[i], "--page=", 7)) {
+               if (!prefixcmp(argv[i], "--page=")) {
                        ctx.qry.page = xstrdup(argv[i] + 7);
                }
-               if (!strncmp(argv[i], "--head=", 7)) {
+               if (!prefixcmp(argv[i], "--head=")) {
                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
                }
-               if (!strncmp(argv[i], "--sha1=", 7)) {
+               if (!prefixcmp(argv[i], "--sha1=")) {
                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
                }
-               if (!strncmp(argv[i], "--ofs=", 6)) {
+               if (!prefixcmp(argv[i], "--ofs=")) {
                        ctx.qry.ofs = atoi(argv[i] + 6);
                }
-               if (!strncmp(argv[i], "--scan-tree=", 12) ||
-                   !strncmp(argv[i], "--scan-path=", 12)) {
+               if (!prefixcmp(argv[i], "--scan-tree=") ||
+                   !prefixcmp(argv[i], "--scan-path=")) {
                        /* HACK: the global snapshot bitmask defines the
                         * set of allowed snapshot formats, but the config
                         * file hasn't been parsed yet so the mask is
@@ -922,12 +924,15 @@ static int calc_ttl()
        if (!ctx.qry.page)
                return ctx.cfg.cache_repo_ttl;
 
-       if (ctx.qry.has_symref)
-               return ctx.cfg.cache_dynamic_ttl;
+       if (!strcmp(ctx.qry.page, "about"))
+               return ctx.cfg.cache_about_ttl;
 
        if (ctx.qry.has_sha1)
                return ctx.cfg.cache_static_ttl;
 
+       if (ctx.qry.has_symref)
+               return ctx.cfg.cache_dynamic_ttl;
+
        return ctx.cfg.cache_repo_ttl;
 }
 
@@ -973,7 +978,10 @@ int main(int argc, const char **argv)
        }
 
        ttl = calc_ttl();
-       ctx.page.expires += ttl * 60;
+       if (ttl < 0)
+               ctx.page.expires += 10 * 365 * 24 * 60 * 60; /* 10 years */
+       else
+               ctx.page.expires += ttl * 60;
        if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
                ctx.cfg.nocache = 1;
        if (ctx.cfg.nocache)