- Fixed glob:// stream handling in (Recursive)DirectoryIterator.

diff --git a/NEWS b/NEWS
index c48c1d6cc0f149092d333b744ef9f085401bd666..2fd203cae76fe87e626bf27e05af50c3c313b835 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ PHP                                                                        NEWS
     SplObjectStorage. (Marcus)
   . Added ArrayAccess support to SplObjectStorage. (Marcus)
   . Added SplDoublyLinkedList, SplStack, SplQueue classes. (Etienne)
+  . Fixed glob:// stream handling in (Recursive)DirectoryIterator. (Marcus)
 - Added ability to use Traversable objects instead of plain arrays in ext/soap.
   (Joshua Reese, Dmitry)
 - Added "?:" operator. (Marcus)

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index f371f30793370c3dc171820d75132d405c799e27..f0a4509fb470febd76d2f2dcda1ca0c6ca732017 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -76,8 +76,8 @@ static void spl_filesystem_object_free_storage(void *object TSRMLS_DC) /* {{{ */
        
        zend_object_std_dtor(&intern->std TSRMLS_CC);
        
-       if (intern->path) {
-               efree(intern->path);
+       if (intern->_path) {
+               efree(intern->_path);
        }
        if (intern->file_name) {
                efree(intern->file_name);
@@ -154,6 +154,19 @@ static zend_object_value spl_filesystem_object_new(zend_class_entry *class_type
 }
 /* }}} */
 
+PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
+{
+       if (intern->type == SPL_FS_DIR) {
+               if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
+                       return php_glob_stream_get_path(intern->u.dir.dirp, 0, len);
+               }
+       }
+       if (len) {
+               *len = intern->_path_len;
+       }
+       return intern->_path;
+} /* }}} */
+
 static inline void spl_filesystem_object_get_file_name(spl_filesystem_object *intern TSRMLS_DC) /* {{{ */
 {
        if (!intern->file_name) {
@@ -163,7 +176,9 @@ static inline void spl_filesystem_object_get_file_name(spl_filesystem_object *in
                        php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not initialized");
                        break;
                case SPL_FS_DIR:
-                       intern->file_name_len = spprintf(&intern->file_name, 0, "%s%c%s", intern->path, DEFAULT_SLASH, intern->u.dir.entry.d_name);
+                       intern->file_name_len = spprintf(&intern->file_name, 0, "%s%c%s",
+                                                        spl_filesystem_object_get_path(intern, NULL TSRMLS_CC),
+                                                        DEFAULT_SLASH, intern->u.dir.entry.d_name);
                        break;
                }
        }
@@ -174,17 +189,17 @@ static inline void spl_filesystem_object_get_file_name(spl_filesystem_object *in
 static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TSRMLS_DC)
 {
        intern->type = SPL_FS_DIR;
-       intern->path_len = strlen(path);
+       intern->_path_len = strlen(path);
        intern->u.dir.dirp = php_stream_opendir(path, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
 
-       if (intern->path_len && (path[intern->path_len-1] == '/'
+       if (intern->_path_len && (path[intern->_path_len-1] == '/'
 #if defined(PHP_WIN32) || defined(NETWARE)
                || path[intern->path_len-1] == '\\'
 #endif
        )) {
-               intern->path = estrndup(path, --intern->path_len);
+               intern->_path = estrndup(path, --intern->_path_len);
        } else {
-               intern->path = estrndup(path, intern->path_len);
+               intern->_path = estrndup(path, intern->_path_len);
        }
        intern->u.dir.index = 0;
 
@@ -265,13 +280,13 @@ static zend_object_value spl_filesystem_object_clone(zval *zobject TSRMLS_DC)
 
        switch (source->type) {
        case SPL_FS_INFO:
-               intern->path_len = source->path_len;
-               intern->path = estrndup(source->path, source->path_len);
+               intern->_path_len = source->_path_len;
+               intern->_path = estrndup(source->_path, source->_path_len);
                intern->file_name_len = source->file_name_len;
                intern->file_name = estrndup(source->file_name, intern->file_name_len);
                break;
        case SPL_FS_DIR:
-               spl_filesystem_dir_open(intern, source->path TSRMLS_CC);
+               spl_filesystem_dir_open(intern, source->_path TSRMLS_CC);
                break;
        case SPL_FS_FILE:
                php_error_docref(NULL TSRMLS_CC, E_ERROR, "An object of class %s cannot be cloned", old_object->ce->name);
@@ -308,11 +323,11 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char *path,
        p2 = 0;
 #endif
        if (p1 || p2) {
-               intern->path_len = (p1 > p2 ? p1 : p2) - path;
+               intern->_path_len = (p1 > p2 ? p1 : p2) - path;
        } else {
-               intern->path_len = 0;
+               intern->_path_len = 0;
        }
-       intern->path = estrndup(path, intern->path_len);
+       intern->_path = estrndup(path, intern->_path_len);
 } /* }}} */
 
 static spl_filesystem_object * spl_filesystem_object_create_info(spl_filesystem_object *source, char *file_path, int file_path_len, int use_copy, zend_class_entry *ce, zval *return_value TSRMLS_DC) /* {{{ */
@@ -392,8 +407,8 @@ static spl_filesystem_object * spl_filesystem_object_create_type(int ht, spl_fil
                } else {
                        intern->file_name = estrndup(source->file_name, source->file_name_len);
                        intern->file_name_len = source->file_name_len;
-                       intern->path = estrndup(source->path, source->path_len);
-                       intern->path_len = source->path_len;
+                       intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
+                       intern->_path = estrndup(intern->_path, intern->_path_len);
                }
                break;
        case SPL_FS_FILE:
@@ -414,8 +429,8 @@ static spl_filesystem_object * spl_filesystem_object_create_type(int ht, spl_fil
                } else {
                        intern->file_name = source->file_name;
                        intern->file_name_len = source->file_name_len;
-                       intern->path = estrndup(source->path, source->path_len);
-                       intern->path_len = source->path_len;
+                       intern->_path = spl_filesystem_object_get_path(source, &intern->_path_len TSRMLS_CC);
+                       intern->_path = estrndup(intern->_path, intern->_path_len);
                
                        intern->u.file.open_mode = "r";
                        intern->u.file.open_mode_len = 1;
@@ -464,8 +479,8 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
        spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(obj TSRMLS_CC);
        HashTable *rv;
        zval *tmp, zrv;
-       char *pnstr;
-       int  pnlen;
+       char *pnstr, *path;
+       int  pnlen, path_len;
        char stmp[2];
 
        *is_temp = 1;
@@ -478,15 +493,23 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 
        zend_hash_copy(rv, intern->std.properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
+       path = spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
        pnstr = spl_gen_private_prop_name(spl_ce_SplFileInfo, "pathName", sizeof("pathName")-1, &pnlen TSRMLS_CC);
-       add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->path, intern->path_len, 1);
+       add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, path, path_len, 1);
        efree(pnstr);
        if (intern->file_name) {
                pnstr = spl_gen_private_prop_name(spl_ce_SplFileInfo, "fileName", sizeof("fileName")-1, &pnlen TSRMLS_CC);
                add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->file_name, intern->file_name_len, 1);
                efree(pnstr);
        }
-       if (intern->type == SPL_FS_DIR && intern->u.dir.sub_path) {
+       if (intern->type == SPL_FS_DIR) {
+               pnstr = spl_gen_private_prop_name(spl_ce_RecursiveDirectoryIterator, "glob", sizeof("glob")-1, &pnlen TSRMLS_CC);
+               if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
+                       add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->_path, intern->_path_len, 1);
+               } else {
+                       add_assoc_bool_ex(&zrv, pnstr, pnlen+1, 0);
+               }
+               efree(pnstr);
                pnstr = spl_gen_private_prop_name(spl_ce_RecursiveDirectoryIterator, "subPathName", sizeof("subPathName")-1, &pnlen TSRMLS_CC);
                add_assoc_stringl_ex(&zrv, pnstr, pnlen+1, intern->u.dir.sub_path, intern->u.dir.sub_path_len, 1);
                efree(pnstr);
@@ -610,8 +633,11 @@ SPL_METHOD(DirectoryIterator, valid)
 SPL_METHOD(SplFileInfo, getPath)
 {
        spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+       char *path;
+       int path_len;
 
-       RETURN_STRING(intern->path, 1);
+  path = spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
+       RETURN_STRINGL(path, path_len, 1);
 }
 /* }}} */
 
@@ -620,9 +646,12 @@ SPL_METHOD(SplFileInfo, getPath)
 SPL_METHOD(SplFileInfo, getFilename)
 {
        spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+       int path_len;
 
-       if (intern->path_len && intern->path_len < intern->file_name_len) {
-               RETURN_STRINGL(intern->file_name + intern->path_len + 1, intern->file_name_len - (intern->path_len + 1), 1);
+  spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
+       
+       if (path_len && path_len < intern->file_name_len) {
+               RETURN_STRINGL(intern->file_name + path_len + 1, intern->file_name_len - (path_len + 1), 1);
        } else {
                RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
        }
@@ -646,15 +675,17 @@ SPL_METHOD(SplFileInfo, getBasename)
        spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
        char *fname, *suffix = 0;
        size_t flen;
-       int slen = 0;
+       int slen = 0, path_len;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &suffix, &slen) == FAILURE) {
                return;
        }
 
-       if (intern->path_len && intern->path_len < intern->file_name_len) {
-               fname = intern->file_name + intern->path_len + 1;
-               flen = intern->file_name_len - (intern->path_len + 1);
+  spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
+
+       if (path_len && path_len < intern->file_name_len) {
+               fname = intern->file_name + path_len + 1;
+               flen = intern->file_name_len - (path_len + 1);
        } else {
                fname = intern->file_name;
                flen = intern->file_name_len;
@@ -998,7 +1029,9 @@ SPL_METHOD(SplFileInfo, getPathInfo)
        php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException TSRMLS_CC);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &ce) == SUCCESS) {
-               spl_filesystem_object_create_info(intern, intern->path, intern->path_len, 1, ce, return_value TSRMLS_CC);
+               int path_len;
+    char *path = spl_filesystem_object_get_path(intern, &path_len TSRMLS_CC);
+               spl_filesystem_object_create_info(intern, path, path_len, 1, ce, return_value TSRMLS_CC);
        }
 
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
@@ -1790,11 +1823,11 @@ SPL_METHOD(SplFileObject, __construct)
                p2 = 0;
 #endif
                if (p1 || p2) {
-                       intern->path_len = (p1 > p2 ? p1 : p2) - intern->file_name;
+                       intern->_path_len = (p1 > p2 ? p1 : p2) - intern->file_name;
                } else {
-                       intern->path_len = 0;
+                       intern->_path_len = 0;
                }
-               intern->path = estrndup(intern->file_name, intern->path_len);
+               intern->_path = estrndup(intern->file_name, intern->_path_len);
        }
 
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
@@ -1830,8 +1863,8 @@ SPL_METHOD(SplTempFileObject, __construct)
        intern->u.file.zcontext = NULL;
        
        if (spl_filesystem_file_open(intern, 0, 0 TSRMLS_CC) == SUCCESS) {
-               intern->path_len = 0;
-               intern->path = estrndup("", 0);
+               intern->_path_len = 0;
+               intern->_path = estrndup("", 0);
        }
 
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);

diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h
index 2d9d1d5af90b7c2263d6135478eadaef75b9291a..0764920512fec81782825a91a71bc9db7d00c9f3 100755 (executable)
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
@@ -43,6 +43,8 @@ typedef struct _spl_filesystem_object  spl_filesystem_object;
 typedef void (*spl_foreign_dtor_t)(spl_filesystem_object *object TSRMLS_DC);
 typedef void (*spl_foreign_clone_t)(spl_filesystem_object *src, spl_filesystem_object *dst TSRMLS_DC);
 
+PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC);
+
 typedef struct _spl_other_handler {
        spl_foreign_dtor_t     dtor;
        spl_foreign_clone_t    clone;
@@ -52,8 +54,8 @@ struct _spl_filesystem_object {
        zend_object        std;
        void               *oth;
        spl_other_handler  *oth_handler;
-       char               *path;
-       int                path_len;
+       char               *_path;
+       int                _path_len;
        char               *file_name;
        int                file_name_len; 
        SPL_FS_OBJ_TYPE    type;