From bf9c5928e13f6094d30b8f97efc8f828d8bf3b97 Mon Sep 17 00:00:00 2001 From: amosjeffries <> Date: Tue, 26 Feb 2008 06:26:10 +0000 Subject: [PATCH] Author: Gonzalo Arana Bug #2180 (update) - include minor issues Use strtok_r() instead of hacking around strtok() problems. --- src/cache_cf.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 372af2b04e..86f2bb9cfd 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.cc,v 1.528.2.2 2008/02/25 23:25:25 amosjeffries Exp $ + * $Id: cache_cf.cc,v 1.528.2.3 2008/02/25 23:26:10 amosjeffries Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -209,12 +209,11 @@ static int parseManyConfigFiles(char* files, int depth) { int error_count = 0; - char* tmp = files; - char* file = strtok(tmp, w_space); + char* saveptr = NULL; + char* file = strtok_r(tmp, w_space, &saveptr); while (file != NULL) { - tmp += strlen(file) +1; error_count += parseOneConfigFile(file, depth); - file = strtok(tmp, w_space); + file = strtok_r(tmp, w_space, &saveptr); } return error_count; } -- 2.47.2