From 30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 18 May 2007 03:00:54 +0200 Subject: Enable url=value querystring parameter This makes is possible to use repo-urls like '/pub/scm/git/git.git' and even add path specifications, like '/pub/scm/git/git.git/log/documentation'. Signed-off-by: Lars Hjemli --- cache.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cache.c') diff --git a/cache.c b/cache.c index 8df7c26..7cdea9b 100644 --- a/cache.c +++ b/cache.c @@ -43,15 +43,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; -- cgit 1.4.1 From 72fa5c63f80262019d807658cc537c9897c4b1d1 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Fri, 18 May 2007 03:54:15 +0200 Subject: cache_safe_filename() needs more buffers The single static buffer makes it impossible to use the result of two different calls to this function simultaneously. Fix it by using 4 buffers. Signed-off-by: Lars Hjemli --- cache.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'cache.c') diff --git a/cache.c b/cache.c index 7cdea9b..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) -- cgit 1.4.1