summaryrefslogtreecommitdiff
path: root/cache.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-20 20:09:55 +0000
committerLars Hjemli <hjemli@gmail.com>2007-05-20 20:09:55 +0000
commitdc3ac3f76077c5d612d42e8beb4878e43acfc58a (patch)
treedfb996c0ce9833841578e1f0accbb5a387c01237 /cache.c
parent977a0b173df6fe1a4d362fe4c70f9badff1fd46c (diff)
parent3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (diff)
downloadcgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar
cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.gz
cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.zip
Merge branch 'virtual-url'
* virtual-url: Don't be fooled by trailing '/' in url-parameter cache_safe_filename() needs more buffers Enable url=value querystring parameter Add lookup-function for valid repo commands Move cgit_get_repoinfo into shared.c
Diffstat (limited to 'cache.c')
-rw-r--r--cache.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/cache.c b/cache.c
index 8df7c26..372e38d 100644
--- a/cache.c
+++ b/cache.c
@@ -12,18 +12,23 @@ const int NOLOCK = -1;
char *cache_safe_filename(const char *unsafe)
{
- static char buf[PATH_MAX];
- char *s = buf;
+ 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 == '|' ||
+ if (c == '/' || c == ' ' || c == '&' || c == '|' ||
c == '>' || c == '<' || c == '.')
c = '_';
*s++ = c;
}
*s = '\0';
- return buf;
+ return buf[bufidx];
}
int cache_exist(struct cacheitem *item)
@@ -43,15 +48,18 @@ int cache_create_dirs()
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
- if (!cgit_query_repo)
+ 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;