X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/f5069d88dff7a7ed2f4665904b03e906cca75a7c..5764fe95469f65fdee285467f0f87d188fc1a780:/cache.c?ds=inline

diff --git a/cache.c b/cache.c
index 0ffa502..89f7ecd 100644
--- 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,42 +45,59 @@ 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;
 	}
 	return 1;
 }
 
+int cache_refill_overdue(const char *lockfile)
+{
+	struct stat st;
+
+	if (stat(lockfile, &st))
+		return 0;
+	else
+		return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
+}
+
 int cache_lock(struct cacheitem *item)
 {
-	int ret;
-	char *lockfile = fmt("%s.lock", item->name);
+	int i = 0;
+	char *lockfile = xstrdup(fmt("%s.lock", item->name));
+
+ top:
+	if (++i > ctx.cfg.max_lock_attempts)
+		die("cache_lock: unable to lock %s: %s",
+		    item->name, strerror(errno));
+
+       	item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
 
- top:  
-       	item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR);
 	if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs())
 		goto top;
-	if (item->fd == NOLOCK && errno == EEXIST) {
-		struct stat st;
-		time_t t;
-		if (stat(lockfile, &st))
-			return ret;
-		t = time(NULL);
-		if (t-st.st_mtime > cgit_cache_max_create_time && 
-		    !unlink(lockfile))
+
+	if (item->fd == NOLOCK && errno == EEXIST &&
+	    cache_refill_overdue(lockfile) && !unlink(lockfile))
 			goto top;
-		return 0;
-	}
+
+	free(lockfile);
 	return (item->fd > 0);
 }
 
@@ -90,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)