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>

diff --git a/cache.c b/cache.c
index 7cdea9b83bf592cc42422365ee48982a5d311bf5..372e38d628cbfaae48beea6538c38dd0638f4b4b 100644 (file)
--- 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)