X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/318d106300102c19d114a4ea89265b0a4060d9cb..776200b1c10536174f68fc6599fc709ae620db54:/cache.c

diff --git a/cache.c b/cache.c
index 2e1ef8c..372e38d 100644
--- 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;
@@ -74,7 +80,7 @@ int cache_refill_overdue(const char *lockfile)
 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)
@@ -90,6 +96,7 @@ int cache_lock(struct cacheitem *item)
 	    cache_refill_overdue(lockfile) && !unlink(lockfile))
 			goto top;
 
+	free(lockfile);
 	return (item->fd > 0);
 }
 
@@ -99,6 +106,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)