summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLars Hjemli2007-05-18 03:54:15 +0200
committerLars Hjemli2007-05-18 22:51:02 +0200
commit72fa5c63f80262019d807658cc537c9897c4b1d1 (patch)
treedd10f33b94e95574a145ddd7e82b22356039f3a0
parent30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de (diff)
downloadcgit-72fa5c63f80262019d807658cc537c9897c4b1d1.tar.gz
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 <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--cache.c13
1 files changed, 9 insertions, 4 deletions
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)