moriyoshi Wed Oct 29 16:51:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard dir.c
Log:
MFH(r-1.131): This check's always necessary.
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.12 php-src/ext/standard/dir.c:1.109.2.13
--- php-src/ext/standard/dir.c:1.109.2.12 Wed Oct 29 13:46:40 2003
+++ php-src/ext/standard/dir.c Wed Oct 29 16:51:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.109.2.12 2003/10/29 18:46:40 moriyoshi Exp $ */
+/* $Id: dir.c,v 1.109.2.13 2003/10/29 21:51:22 moriyoshi Exp $ */
/* {{{ includes/startup/misc */
@@ -396,13 +396,11 @@
RETURN_FALSE;
}
-#ifndef GLOB_NOMATCH
/* now catch the FreeBSD style of "no matches" */
if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return;
}
-#endif
/* we assume that any glob pattern will match files from one directory only
so checking the dirname of the first match should be sufficient */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
