From: Marcus Boerger <helly@php.net> Date: Wed, 30 Jan 2008 23:43:13 +0000 (+0000) Subject: - MFH Get rid of overoptimization X-Git-Tag: RELEASE_1_3_1~209 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81b40f7047e12c2d4d24bfd5f16f6d1f46fea4aa;p=php - MFH Get rid of overoptimization --- diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 4345056dd2..afc4e128e8 100755 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -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);