From: foobar <sniper@php.net>
Date: Tue, 28 Nov 2000 09:13:22 +0000 (+0000)
Subject: @- Fixed a bug which made readdir() unusable in some systems. (Jani)
X-Git-Tag: php-4.0.4RC3~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5a997ff59e5b769bf3125fce26a545a5a3a2c50;p=php

@- 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 79e4f13da3..436c850d6d 100644
--- 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;