From: Hannes Magnusson <bjori@php.net>
Date: Thu, 10 May 2007 19:48:30 +0000 (+0000)
Subject: use php_strtok_r() rather than strsep()
X-Git-Tag: php-5.2.3RC1~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63c11738f8efe8dc6a3fc2719df105eaafb98f0f;p=php

use php_strtok_r() rather than strsep()
# Fixes build on, for instance, solaris
---

diff --git a/main/php_ini.c b/main/php_ini.c
index ae39d81d5b..aa9a96ceeb 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -359,13 +359,16 @@ int php_init_config(TSRMLS_D)
 
 				if ((path = getenv("PATH")) != NULL) {
 					char *search_dir, search_path[MAXPATHLEN];
+					char *last;
 
-					while ((search_dir = strsep(&path, ":")) != NULL) {
+					search_dir = php_strtok_r(path, ":", &last);
+					while (search_dir) {
 						snprintf(search_path, MAXPATHLEN, "%s/%s", search_dir, sapi_module.executable_location);
 						if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK)) {
 							found = 1;
 							break;
 						}
+						search_dir = php_strtok_r(NULL, ":", &last);
 					}
 				}
 				if (!found) {