diff options
author | Lars Hjemli | 2007-01-12 00:24:35 +0100 |
---|---|---|
committer | Lars Hjemli | 2007-01-12 00:24:35 +0100 |
commit | 2c2047ff67a1e0053f95776e5079e432f69cea54 (patch) | |
tree | 0572bd25c3f7ef43494664cca750c940c9e93ef1 | |
parent | 83a5f35a2724ee60bfd8c5679b98da7008272254 (diff) | |
download | cgit-2c2047ff67a1e0053f95776e5079e432f69cea54.tar.gz cgit-2c2047ff67a1e0053f95776e5079e432f69cea54.tar.bz2 cgit-2c2047ff67a1e0053f95776e5079e432f69cea54.zip |
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.c | 16 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 |
3 files changed, 18 insertions, 1 deletions
@@ -10,6 +10,22 @@ | |||
10 | 10 | ||
11 | const int NOLOCK = -1; | 11 | const int NOLOCK = -1; |
12 | 12 | ||
13 | char *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 | |||
13 | int cache_exist(struct cacheitem *item) | 29 | int cache_exist(struct cacheitem *item) |
14 | { | 30 | { |
15 | if (stat(item->name, &item->st)) { | 31 | if (stat(item->name, &item->st)) { |
@@ -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) |
@@ -87,6 +87,7 @@ extern int cgit_read_config(const char *filename, configfn fn); | |||
87 | extern int cgit_parse_query(char *txt, configfn fn); | 87 | extern int cgit_parse_query(char *txt, configfn fn); |
88 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 88 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
89 | 89 | ||
90 | extern char *cache_safe_filename(const char *unsafe); | ||
90 | extern int cache_lock(struct cacheitem *item); | 91 | extern int cache_lock(struct cacheitem *item); |
91 | extern int cache_unlock(struct cacheitem *item); | 92 | extern int cache_unlock(struct cacheitem *item); |
92 | extern int cache_cancel_lock(struct cacheitem *item); | 93 | extern int cache_cancel_lock(struct cacheitem *item); |