aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-01-12 08:24:35 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-01-12 08:24:35 (JST)
commit2c2047ff67a1e0053f95776e5079e432f69cea54 (patch)
tree0572bd25c3f7ef43494664cca750c940c9e93ef1
parent83a5f35a2724ee60bfd8c5679b98da7008272254 (diff)
downloadcgit-2c2047ff67a1e0053f95776e5079e432f69cea54.zip
cgit-2c2047ff67a1e0053f95776e5079e432f69cea54.tar.gz
Remove troublesome chars from cachefile names
Add a funtion cache_safe_filename() which replaces possibly bad filename characters with '_'. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cache.c16
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
3 files changed, 18 insertions, 1 deletions
diff --git a/cache.c b/cache.c
index 1ff1251..8df7c26 100644
--- a/cache.c
+++ b/cache.c
@@ -10,6 +10,22 @@
10 10
11const int NOLOCK = -1; 11const int NOLOCK = -1;
12 12
13char *cache_safe_filename(const char *unsafe)
14{
15 static char buf[PATH_MAX];
16 char *s = buf;
17 char c;
18
19 while(unsafe && (c = *unsafe++) != 0) {
20 if (c == '/' || c == ' ' || c == '&' || c == '|' ||
21 c == '>' || c == '<' || c == '.')
22 c = '_';
23 *s++ = c;
24 }
25 *s = '\0';
26 return buf;
27}
28
13int cache_exist(struct cacheitem *item) 29int cache_exist(struct cacheitem *item)
14{ 30{
15 if (stat(item->name, &item->st)) { 31 if (stat(item->name, &item->st)) {
diff --git a/cgit.c b/cgit.c
index d975570..a3a04d9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -22,7 +22,7 @@ static void cgit_prepare_cache(struct cacheitem *item)
22 } else { 22 } else {
23 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 23 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
24 cgit_query_repo, cgit_query_page, 24 cgit_query_repo, cgit_query_page,
25 cgit_querystring)); 25 cache_safe_filename(cgit_querystring)));
26 if (cgit_query_has_symref) 26 if (cgit_query_has_symref)
27 item->ttl = cgit_cache_dynamic_ttl; 27 item->ttl = cgit_cache_dynamic_ttl;
28 else if (cgit_query_has_sha1) 28 else if (cgit_query_has_sha1)
diff --git a/cgit.h b/cgit.h
index f915c86..3601e49 100644
--- a/cgit.h
+++ b/cgit.h
@@ -87,6 +87,7 @@ extern int cgit_read_config(const char *filename, configfn fn);
87extern int cgit_parse_query(char *txt, configfn fn); 87extern int cgit_parse_query(char *txt, configfn fn);
88extern struct commitinfo *cgit_parse_commit(struct commit *commit); 88extern struct commitinfo *cgit_parse_commit(struct commit *commit);
89 89
90extern char *cache_safe_filename(const char *unsafe);
90extern int cache_lock(struct cacheitem *item); 91extern int cache_lock(struct cacheitem *item);
91extern int cache_unlock(struct cacheitem *item); 92extern int cache_unlock(struct cacheitem *item);
92extern int cache_cancel_lock(struct cacheitem *item); 93extern int cache_cancel_lock(struct cacheitem *item);