[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/streams/plain_wrapper.c trunk/main/streams/plain_wrapper.c

[Pierre Joye]

pajoye                                   Sun, 21 Feb 2010 17:44:25 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=295308

Log:
- get the right error on windows

Changed paths:
    U   php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
    U   php/php-src/trunk/main/streams/plain_wrapper.c

Modified: php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c   2010-02-21 
17:34:25 UTC (rev 295307)
+++ php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c   2010-02-21 
17:44:25 UTC (rev 295308)
@@ -866,6 +866,10 @@
        dir = VCWD_OPENDIR(path);

 #ifdef PHP_WIN32
+       if (!dir) {
+               php_win32_docref2_from_error(GetLastError(), path, path 
TSRMLS_CC);
+       }
+
        if (dir && dir->finished) {
                closedir(dir);
                dir = NULL;

Modified: php/php-src/trunk/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/trunk/main/streams/plain_wrapper.c      2010-02-21 17:34:25 UTC 
(rev 295307)
+++ php/php-src/trunk/main/streams/plain_wrapper.c      2010-02-21 17:44:25 UTC 
(rev 295308)
@@ -863,6 +863,10 @@
        dir = VCWD_OPENDIR(path);

 #ifdef PHP_WIN32
+       if (!dir) {
+               php_win32_docref2_from_error(GetLastError(), path, path 
TSRMLS_CC);
+       }
+
        if (dir && dir->finished) {
                closedir(dir);
                dir = NULL;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php