From 5019866c94a7aab18ebbb14061e0ce22fb4adc47 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 18 Jan 2018 11:34:40 +0100
Subject: Simplify the previous commit

---
 src/snuffleupagus.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 90ed7ec..219edca 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -182,31 +182,18 @@ static PHP_INI_MH(OnUpdateConfiguration) {
   }
 
   glob_t globbuf;
-  char *config_file = strtok(new_value->val, ",");
-  int ret = glob(config_file, GLOB_BRACE | GLOB_NOCHECK, NULL, &globbuf);
+  char *config_file;
+  char *rest = new_value->val;
 
-  if (ret != 0) {
-    SNUFFLEUPAGUS_G(is_config_valid) = false;
-    globfree(&globbuf);
-    return FAILURE;
-  }
-
-  for (size_t i = 0; globbuf.gl_pathv[i]; i++) {
-    if (sp_parse_config(globbuf.gl_pathv[i]) != SUCCESS) {
-      SNUFFLEUPAGUS_G(is_config_valid) = false;
-      globfree(&globbuf);
-      return FAILURE;
-    }
-  }
-  globfree(&globbuf);
+  while ((config_file = strtok_r(rest, ",", &rest))) {
+    int ret = glob(config_file, GLOB_BRACE | GLOB_NOCHECK, NULL, &globbuf);
 
-  while ((config_file = strtok(NULL, ","))) {
-    ret = glob(config_file, GLOB_BRACE | GLOB_NOCHECK, NULL, &globbuf);
     if (ret != 0) {
       SNUFFLEUPAGUS_G(is_config_valid) = false;
       globfree(&globbuf);
       return FAILURE;
     }
+
     for (size_t i = 0; globbuf.gl_pathv[i]; i++) {
       if (sp_parse_config(globbuf.gl_pathv[i]) != SUCCESS) {
         SNUFFLEUPAGUS_G(is_config_valid) = false;
-- 
cgit v1.3