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 2e1ef8cc9e0fe7742965a1b3e845f12fa1fab13f..89f7ecdcc0df88bf5cb6be3c46397b5f077e786b 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -7,29 +7,29 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
-void cache_prepare(struct cacheitem *item)
+char *cache_safe_filename(const char *unsafe)
 {
-       if (!cgit_query_repo) {
-               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
-               item->ttl = cgit_cache_root_ttl;
-       } else if (!cgit_query_page) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
-                          cgit_query_repo));
-               item->ttl = cgit_cache_repo_ttl;
-       } else {
-               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
-                          cgit_query_repo, cgit_query_page, 
-                          cgit_querystring));
-               if (cgit_query_has_symref)
-                       item->ttl = cgit_cache_dynamic_ttl;
-               else if (cgit_query_has_sha1)
-                       item->ttl = cgit_cache_static_ttl;
-               else
-                       item->ttl = cgit_cache_repo_ttl;
+       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 == '|' ||
+                   c == '>' || c == '<' || c == '.')
+                       c = '_';
+               *s++ = c;
        }
+       *s = '\0';
+       return buf[bufidx];
 }
 
 int cache_exist(struct cacheitem *item)
@@ -45,16 +45,23 @@ int cache_create_dirs()
 {
        char *path;
 
-       if (!cgit_query_repo)
+       path = fmt("%s", ctx.cfg.cache_root);
+       if (mkdir(path, S_IRWXU) && errno!=EEXIST)
+               return 0;
+
+       if (!ctx.repo)
                return 0;
 
-       path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
+       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, cgit_query_repo, 
-                          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;
        }
@@ -68,16 +75,16 @@ 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)
 {
        int i = 0;
-       char *lockfile = fmt("%s.lock", item->name);
+       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));
 
@@ -90,6 +97,7 @@ int cache_lock(struct cacheitem *item)
            cache_refill_overdue(lockfile) && !unlink(lockfile))
                        goto top;
 
+       free(lockfile);
        return (item->fd > 0);
 }
 
@@ -99,6 +107,11 @@ int cache_unlock(struct cacheitem *item)
        return (rename(fmt("%s.lock", item->name), item->name) == 0);
 }
 
+int cache_cancel_lock(struct cacheitem *item)
+{
+       return (unlink(fmt("%s.lock", item->name)) == 0);
+}
+
 int cache_expired(struct cacheitem *item)
 {
        if (item->ttl < 0)