Makefile: add support for building w.o. preinstalled git

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index 2e1ef8cc9e0fe7742965a1b3e845f12fa1fab13f..8df7c2677bc24f6980888f95523931b7538bd74a 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -10,26 +10,20 @@
 
 const int NOLOCK = -1;
 
 
 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[PATH_MAX];
+       char *s = buf;
+       char c;
+
+       while(unsafe && (c = *unsafe++) != 0) {
+               if (c == '/' || c == ' ' || c == '&' || c == '|' || 
+                   c == '>' || c == '<' || c == '.')
+                       c = '_';
+               *s++ = c;

        }
        }

+       *s = '\0';
+       return buf;

 }
 
 int cache_exist(struct cacheitem *item)
 }
 
 int cache_exist(struct cacheitem *item)


@@ -45,6 +39,10 @@ int cache_create_dirs()
 {
        char *path;
 
 {
        char *path;
 

+       path = fmt("%s", cgit_cache_root);
+       if (mkdir(path, S_IRWXU) && errno!=EEXIST)
+               return 0;
+

        if (!cgit_query_repo)
                return 0;
 
        if (!cgit_query_repo)
                return 0;
 


@@ -74,7 +72,7 @@ int cache_refill_overdue(const char *lockfile)
 int cache_lock(struct cacheitem *item)
 {
        int i = 0;
 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)
 
  top:
        if (++i > cgit_max_lock_attempts)


@@ -90,6 +88,7 @@ int cache_lock(struct cacheitem *item)
            cache_refill_overdue(lockfile) && !unlink(lockfile))
                        goto top;
 
            cache_refill_overdue(lockfile) && !unlink(lockfile))
                        goto top;
 

+       free(lockfile);

        return (item->fd > 0);
 }
 
        return (item->fd > 0);
 }
 


@@ -99,6 +98,11 @@ int cache_unlock(struct cacheitem *item)
        return (rename(fmt("%s.lock", item->name), item->name) == 0);
 }
 
        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)
 int cache_expired(struct cacheitem *item)
 {
        if (item->ttl < 0)