From: amosjeffries <>
Date: Tue, 26 Feb 2008 06:40:55 +0000 (+0000)
Subject: Author: hno
X-Git-Tag: SQUID_3_0_STABLE2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b33ca677448b0a8afee6528e144d2aafb86847cc;p=thirdparty%2Fsquid.git

Author: hno
Use our own strwordtok instead of strtok_r. Not only is it portable, but also understands quoting and escaping
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 86f2bb9cfd..50ae1b898a 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.528.2.3 2008/02/25 23:26:10 amosjeffries Exp $
+ * $Id: cache_cf.cc,v 1.528.2.4 2008/02/25 23:40:55 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -210,10 +210,10 @@ parseManyConfigFiles(char* files, int depth)
 {
     int error_count = 0;
     char* saveptr = NULL;
-    char* file = strtok_r(tmp, w_space, &saveptr);
+    char* file = strwordtok(files, &saveptr);
     while (file != NULL) {
         error_count += parseOneConfigFile(file, depth);
-        file = strtok_r(tmp, w_space, &saveptr);
+        file = strwordtok(NULL, &saveptr);
     }
     return error_count;
 }