Merge branch 'repogroups'

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index 39e63a52bc6e488ef20a988b83f28bcf5a0c2db1..372e38d628cbfaae48beea6538c38dd0638f4b4b 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -10,26 +10,25 @@
 
 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,15 +44,22 @@ int cache_create_dirs()
 {
        char *path;
 
-       if (!cgit_query_repo)
+       path = fmt("%s", cgit_cache_root);
+       if (mkdir(path, S_IRWXU) && errno!=EEXIST)
+               return 0;
+
+       if (!cgit_repo)
                return 0;
 
-       path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
+       path = fmt("%s/%s", cgit_cache_root,
+                  cache_safe_filename(cgit_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, 
+               path = fmt("%s/%s/%s", cgit_cache_root,
+                          cache_safe_filename(cgit_repo->url),
                           cgit_query_page);
                if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                        return 0;