From c7faeb736a85aafe2c0d05fccaaf9ae2a0d4ba96 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Sat, 3 Mar 2007 23:41:10 +0000
Subject: [PATCH] - Allow to retrieve flags with php_glob_stream_get_count() -
 Detect meta chars in pathand switch to append mode so that path can  
 actually changes for each entry

---
 main/streams/glob_wrapper.c            | 44 ++++++++++++++++----------
 main/streams/php_stream_glob_wrapper.h |  4 +--
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c
index a9f1e3b5e4..301ce4e8bb 100755
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
@@ -90,11 +90,21 @@ PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, int copy, int *ple
 }
 /* }}} */
 
-PHPAPI int _php_glob_stream_get_count(php_stream *stream STREAMS_DC TSRMLS_DC) /* {{{ */
+PHPAPI int _php_glob_stream_get_count(php_stream *stream, int *pflags STREAMS_DC TSRMLS_DC) /* {{{ */
 {
 	glob_s_t *pglob = (glob_s_t *)stream->abstract;
-	
-	return pglob ? pglob->glob.gl_pathc : 0;
+
+	if (pglob) {
+		if (pflags) {
+			*pflags = pglob->flags;
+		}
+		return pglob->glob.gl_pathc;
+	} else {
+		if (pflags) {
+			*pflags = 0;
+		}
+		return 0;
+	}
 }
 /* }}} */
 
@@ -199,7 +209,7 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, char *pat
 		int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
 {
 	glob_s_t *pglob;
-	int ret;
+	int ret, path_len;
 	char *tmp, *pos;
 
 	if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) {
@@ -208,9 +218,12 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, char *pat
 
 	if (!strncmp(path, "glob://", sizeof("glob://")-1)) {
 		path += sizeof("glob://")-1;
+		path_len = strlen(path);
 		if (opened_path) {
-			*opened_path = estrdup(path);
+			*opened_path = estrndup(path, path_len);
 		}
+	} else {
+		path_len = strlen(path);
 	}
 
 	pglob = ecalloc(sizeof(*pglob), 1);
@@ -225,17 +238,6 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, char *pat
 		}
 	}
 
-#ifdef GLOB_APPEND
-	if ((pglob->flags & GLOB_APPEND) == 0)
-#endif
-	{
-		if (pglob->glob.gl_pathc) {
-			php_glob_stream_path_split(pglob, pglob->glob.gl_pathv[0], 1, &tmp TSRMLS_CC);
-		} else {
-			php_glob_stream_path_split(pglob, path, 1, &tmp TSRMLS_CC);
-		}
-	}
-
 	pos = path;
 	if ((tmp = strrchr(pos, '/')) != NULL) {
 		pos = tmp+1;
@@ -249,6 +251,16 @@ 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;
+	}
+
+	if (pglob->glob.gl_pathc) {
+		php_glob_stream_path_split(pglob, pglob->glob.gl_pathv[0], 1, &tmp TSRMLS_CC);
+	} else {
+		php_glob_stream_path_split(pglob, path, 1, &tmp TSRMLS_CC);
+	}
+
 	return php_stream_alloc(&php_glob_stream_ops, pglob, 0, mode);
 }
 /* }}} */
diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h
index 0306fecb24..003cbef6d1 100755
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h
@@ -29,8 +29,8 @@ PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, int *plen S
 PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, int copy, int *plen STREAMS_DC TSRMLS_DC);
 #define php_glob_stream_get_pattern(stream, copy, plen)	_php_glob_stream_get_pattern((stream), (copy), (plen) STREAMS_CC TSRMLS_CC)
 
-PHPAPI int   _php_glob_stream_get_count(php_stream *stream STREAMS_DC TSRMLS_DC);
-#define php_glob_stream_get_count(stream)	_php_glob_stream_get_count((stream) STREAMS_CC TSRMLS_CC)
+PHPAPI int   _php_glob_stream_get_count(php_stream *stream, int *pflags STREAMS_DC TSRMLS_DC);
+#define php_glob_stream_get_count(stream, pflags)	_php_glob_stream_get_count((stream), (pflags) STREAMS_CC TSRMLS_CC)
 
 END_EXTERN_C()
 
-- 
2.50.1