colder          Tue Jul  8 22:49:35 2008 UTC

  Modified files:              
    /php-src/ext/spl    spl_directory.c 
    /php-src/ext/spl/tests      fileobject_003.phpt 
  Log:
  Woopsy
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.158&r2=1.159&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.158 
php-src/ext/spl/spl_directory.c:1.159
--- php-src/ext/spl/spl_directory.c:1.158       Tue Jul  8 22:40:29 2008
+++ php-src/ext/spl/spl_directory.c     Tue Jul  8 22:49:35 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_directory.c,v 1.158 2008/07/08 22:40:29 colder Exp $ */
+/* $Id: spl_directory.c,v 1.159 2008/07/08 22:49:35 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -394,7 +394,7 @@
                        
                        if (type == IS_UNICODE) {
                                slash_pos.u = (p1.u > p2.u ? p1.u : p2.u);
-                               if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len)) {
+                               if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1)) {
                                        intern->file_name_len = slash_pos.u - 
intern->file_name.u;
                                        
intern->file_name.u[intern->file_name_len] = 0;
                                        continue;
@@ -402,7 +402,7 @@
                                intern->_path_len = slash_pos.u - 
intern->file_name.u;
                        } else {
                                slash_pos.s = (p1.s > p2.s ? p1.s : p2.s);
-                               if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len)) {
+                               if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1)) {
                                        intern->file_name_len = slash_pos.s - 
intern->file_name.s;
                                        
intern->file_name.s[intern->file_name_len] = 0;
                                        continue;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_003.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/spl/tests/fileobject_003.phpt
diff -u php-src/ext/spl/tests/fileobject_003.phpt:1.9 
php-src/ext/spl/tests/fileobject_003.phpt:1.10
--- php-src/ext/spl/tests/fileobject_003.phpt:1.9       Tue Jul  8 22:40:30 2008
+++ php-src/ext/spl/tests/fileobject_003.phpt   Tue Jul  8 22:49:35 2008
@@ -71,15 +71,15 @@
 ===1===
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  unicode(%d) "%s"
+  unicode(%d) "%s%etests"
   [u"fileName":u"SplFileInfo":private]=>
-  unicode(%d) ""
+  unicode(%d) "tests"
 }
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
   unicode(%d) "%s"
   [u"fileName":u"SplFileInfo":private]=>
-  unicode(%d) ""
+  unicode(%d) "tests"
 }
 bool(false)
 bool(true)
@@ -92,8 +92,8 @@
 string(%d) "%sspl"
 bool(true)
 unicode(%d) "%stests"
-unicode(%d) "%stests"
-unicode(%d) "%stests"
+unicode(%d) "tests"
+unicode(%d) "%s%espl"
 ===2===
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
@@ -103,7 +103,7 @@
 }
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  unicode(%d) "%s"
+  unicode(%d) "%s%etests"
   [u"fileName":u"SplFileInfo":private]=>
   unicode(%d) "%s"
 }



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

Reply via email to