Make branches, tags and log play better together in the summary view

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index 7cdea9b83bf592cc42422365ee48982a5d311bf5..89f7ecdcc0df88bf5cb6be3c46397b5f077e786b 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -7,23 +7,29 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
 char *cache_safe_filename(const char *unsafe)
 {
-       static char buf[PATH_MAX];
-       char *s = buf;
+       static char buf[4][PATH_MAX];
+       static int bufidx;
+       char *s;
        char c;
 
+       bufidx++;
+       bufidx &= 3;
+       s = buf[bufidx];
+
        while(unsafe && (c = *unsafe++) != 0) {
-               if (c == '/' || c == ' ' || c == '&' || c == '|' || 
+               if (c == '/' || c == ' ' || c == '&' || c == '|' ||
                    c == '>' || c == '<' || c == '.')
                        c = '_';
                *s++ = c;
        }
        *s = '\0';
-       return buf;
+       return buf[bufidx];
 }
 
 int cache_exist(struct cacheitem *item)
@@ -39,23 +45,23 @@ int cache_create_dirs()
 {
        char *path;
 
-       path = fmt("%s", cgit_cache_root);
+       path = fmt("%s", ctx.cfg.cache_root);
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
 
-       if (!cgit_repo)
+       if (!ctx.repo)
                return 0;
 
-       path = fmt("%s/%s", cgit_cache_root,
-                  cache_safe_filename(cgit_repo->url));
+       path = fmt("%s/%s", ctx.cfg.cache_root,
+                  cache_safe_filename(ctx.repo->url));
 
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
 
-       if (cgit_query_page) {
-               path = fmt("%s/%s/%s", cgit_cache_root,
-                          cache_safe_filename(cgit_repo->url),
-                          cgit_query_page);
+       if (ctx.qry.page) {
+               path = fmt("%s/%s/%s", ctx.cfg.cache_root,
+                          cache_safe_filename(ctx.repo->url),
+                          ctx.qry.page);
                if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                        return 0;
        }
@@ -69,7 +75,7 @@ int cache_refill_overdue(const char *lockfile)
        if (stat(lockfile, &st))
                return 0;
        else
-               return (time(NULL) - st.st_mtime > cgit_cache_max_create_time);
+               return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
 }
 
 int cache_lock(struct cacheitem *item)
@@ -78,7 +84,7 @@ int cache_lock(struct cacheitem *item)
        char *lockfile = xstrdup(fmt("%s.lock", item->name));
 
  top:
-       if (++i > cgit_max_lock_attempts)
+       if (++i > ctx.cfg.max_lock_attempts)
                die("cache_lock: unable to lock %s: %s",
                    item->name, strerror(errno));