If no further directory exists, php_readdir_r() returns success and sets

*result to NULL.

diff --git a/main/reentrancy.c b/main/reentrancy.c
index c180a5af2b6e2fe809e5e69e896431bc98b1c27b..4677d52ea205c83c0515988a4e2224a9c2e667d1 100644 (file)
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -108,8 +108,10 @@ PHPAPI int php_readdir_r(DIR *dirp, struct dirent *entry,
        
        if (ret == 0)
                *result = entry;
-       else
+       else if (errno == 0) {
                *result = NULL;
+               ret = 0;
+       }
 
        return ret;
 #else