cvs: php4 /ext/standard dir.c
| From: | Andi Gutmans | Date: | Sun, 29 Apr 2001 17:57:23 +0000 |
| Subject: | cvs: php4 /ext/standard dir.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5365@lists.php.net to get a copy of this message | ||
andi Sun Apr 29 10:57:23 2001 EDT
Modified files:
/php4/ext/standard dir.c
Log:
- Fix bug Bug id #5987. It could be fixed by changing readdir.c but I
- prefered not to touch that code but to treat windows a bit differently
- in dir.c
PR:
Submitted by:
Reviewed by:
Obtained from:
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.62 php4/ext/standard/dir.c:1.63
--- php4/ext/standard/dir.c:1.62 Mon Apr 9 14:12:54 2001
+++ php4/ext/standard/dir.c Sun Apr 29 10:57:23 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.62 2001/04/09 21:12:54 elixer Exp $ */
+/* $Id: dir.c,v 1.63 2001/04/29 17:57:23 andi Exp $ */
/* {{{ includes/startup/misc */
@@ -167,8 +167,12 @@
dirp = emalloc(sizeof(php_dir));
dirp->dir = V_OPENDIR((*arg)->value.str.val);
-
- if (! dirp->dir) {
+
+#ifdef PHP_WIN32
+ if (!dirp->dir || dirp->dir->finished) {
+#else
+ if (!dirp->dir) {
+#endif
efree(dirp);
php_error(E_WARNING, "OpenDir: %s (errno %d)", strerror(errno), errno);
RETURN_FALSE;