[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard dir.c

[Stig Bakken]

ssb             Thu Nov 14 17:51:22 2002 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  dir.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.109 php4/ext/standard/dir.c:1.109.2.1
--- php4/ext/standard/dir.c:1.109       Wed Nov 13 08:31:33 2002
+++ php4/ext/standard/dir.c     Thu Nov 14 17:51:21 2002
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.109 2002/11/13 13:31:33 john Exp $ */
+/* $Id: dir.c,v 1.109.2.1 2002/11/14 22:51:21 ssb Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -119,7 +119,7 @@
 
 PHP_MINIT_FUNCTION(dir)
 {
-       static char tmpstr[2];
+       static char dirsep_str[2], pathsep_str[2];
        zend_class_entry dir_class_entry;
 
        INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions);
@@ -128,9 +128,12 @@
 #ifdef ZTS
        ts_allocate_id(&dir_globals_id, sizeof(php_dir_globals), NULL, NULL);
 #endif
-       tmpstr[0] = DEFAULT_SLASH;
-       tmpstr[1] = '\0';
-       REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, 
CONST_CS|CONST_PERSISTENT);
+       dirsep_str[0] = DEFAULT_SLASH;
+       dirsep_str[1] = '\0';
+       REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, 
+CONST_CS|CONST_PERSISTENT);
+    pathsep_str[0] = ZEND_PATHS_SEPARATOR;
+    pathsep_str[1] = '\0';
+       REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, 
+CONST_CS|CONST_PERSISTENT);
 
 #ifdef HAVE_GLOB
 #ifdef GLOB_BRACE



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php