]> granicus.if.org Git - php/commitdiff
- MFH Get rid of overoptimization
authorMarcus Boerger <helly@php.net>
Wed, 30 Jan 2008 23:43:13 +0000 (23:43 +0000)
committerMarcus Boerger <helly@php.net>
Wed, 30 Jan 2008 23:43:13 +0000 (23:43 +0000)
main/streams/glob_wrapper.c

index 4345056dd29d148f20ab120216845638adae11b7..afc4e128e83a3ff789c130dd9020271a04472540 100755 (executable)
@@ -49,7 +49,7 @@ typedef struct {
 PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, int *plen STREAMS_DC TSRMLS_DC) /* {{{ */
 {
        glob_s_t *pglob = (glob_s_t *)stream->abstract;
-       
+
        if (pglob && pglob->path) {
                if (plen) {
                        *plen = pglob->path_len;
@@ -251,9 +251,7 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, char *pat
        pglob->pattern_len = strlen(pos);
        pglob->pattern = estrndup(pos, pglob->pattern_len);
 
-       if (strcspn(path, "*?[") < (path_len - pglob->pattern_len)) {
-               pglob->flags |= GLOB_APPEND;
-       }
+       pglob->flags |= GLOB_APPEND;
 
        if (pglob->glob.gl_pathc) {
                php_glob_stream_path_split(pglob, pglob->glob.gl_pathv[0], 1, &tmp TSRMLS_CC);