@- Fixed a bug which made readdir() unusable in some systems. (Jani)

# Bug report: #7390

diff --git a/main/reentrancy.c b/main/reentrancy.c
index 79e4f13da313a4181889fc184d7103098b6d2e37..436c850d6d02c480f8215d57d3492a1b96197f26 100644 (file)
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -104,15 +104,15 @@ PHPAPI int php_readdir_r(DIR *dirp, struct dirent *entry,
        errno = 0;
 
        ret = readdir_r(dirp, entry);
-       
-       if (ret == 0)
-               *result = entry;
-       else if (errno == 0) {
+
+       if (!ret || errno != 0) {
                *result = NULL;
-               ret = 0;
+       } else {
+               *result = entry;
        }
 
-       return ret;
+       return errno;
+
 #else
        struct dirent *ptr;
        int ret = 0;