cvs: /php4 php_virtual_cwd.c
| From: | Sascha Schumann | Date: | Thu, 04 May 2000 11:36:33 +0000 |
| Subject: | cvs: /php4 php_virtual_cwd.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-14460@lists.php.net to get a copy of this message | ||
sas Thu May 4 04:36:33 2000 EDT
Modified files:
/php4 php_virtual_cwd.c
Log:
s/strtok_r/php_strtok_r/
Index: php4/php_virtual_cwd.c
diff -u php4/php_virtual_cwd.c:1.40 php4/php_virtual_cwd.c:1.41
--- php4/php_virtual_cwd.c:1.40 Sun Apr 30 20:43:07 2000
+++ php4/php_virtual_cwd.c Thu May 4 04:36:33 2000
@@ -13,7 +13,7 @@
#endif
#include "php_virtual_cwd.h"
-#include "php_reentrancy.h" /* for strtok_r */
+#include "php_reentrancy.h" /* for php_strtok_r */
#define VIRTUAL_CWD_DEBUG 0
@@ -40,7 +40,7 @@
#endif
#ifdef ZEND_WIN32
-#define strtok_r(a,b,c) strtok((a),(b))
+#define php_strtok_r(a,b,c) strtok((a),(b))
#define IS_SLASH(c) ((c) == '/' || (c) == '\\')
#define DEFAULT_SLASH '\\'
#define TOKENIZER_STRING "/\\"
@@ -275,7 +275,7 @@
}
- ptr = strtok_r(path_copy, TOKENIZER_STRING, &tok);
+ ptr = php_strtok_r(path_copy, TOKENIZER_STRING, &tok);
while (ptr) {
ptr_length = strlen(ptr);
@@ -306,7 +306,7 @@
memcpy(&state->cwd[state->cwd_length+1], ptr, ptr_length+1);
state->cwd_length += (ptr_length+1);
}
- ptr = strtok_r(NULL, TOKENIZER_STRING, &tok);
+ ptr = php_strtok_r(NULL, TOKENIZER_STRING, &tok);
}
if (verify_path && verify_path(state)) {