Merge pull request #2637 from spevans/pr_readdir

Author: swift-ci

CoreFoundation/Base.subproj/CFFileUtilities.c

@@ -372,7 +372,6 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
         }
     }
 
-    struct dirent buffer;
     struct dirent *dp;
     int err;
 
@@ -389,7 +388,7 @@ CF_PRIVATE CFMutableArrayRef _CFCreateContentsOfDirectory(CFAllocatorRef alloc,
     }
     files = CFArrayCreateMutable(alloc, 0, & kCFTypeArrayCallBacks);
 
-    while((0 == readdir_r(dirp, &buffer, &dp)) && dp) {
+    while((dp = readdir(dirp))) {
         CFURLRef fileURL;
 	unsigned namelen = strlen(dp->d_name);
 

Foundation/FileManager+POSIX.swift

@@ -373,22 +373,22 @@ extension FileManager {
             }
             defer { closedir(dir) }
 
-            var entry = dirent()
-            var result: UnsafeMutablePointer<dirent>? = nil
-
-            while readdir_r(dir, &entry, &result) == 0 {
-                guard result != nil else {
-                    return
-                }
-                let length = Int(_direntNameLength(&entry))
-                let entryName = withUnsafePointer(to: &entry.d_name) { (ptr) -> String in
+            // readdir returns NULL on EOF and error so set errno to 0 to check for errors
+            errno = 0
+            while let entry = readdir(dir) {
+                let length = Int(_direntNameLength(entry))
+                let entryName = withUnsafePointer(to: entry.pointee.d_name) { (ptr) -> String in
                     let namePtr = UnsafeRawPointer(ptr).assumingMemoryBound(to: CChar.self)
                     return string(withFileSystemRepresentation: namePtr, length: length)
                 }
                 if entryName != "." && entryName != ".." {
-                    let entryType = Int32(entry.d_type)
+                    let entryType = Int32(entry.pointee.d_type)
                     try closure(entryName, entryType)
                 }
+                errno = 0
+            }
+            guard errno == 0 else {
+                throw _NSErrorWithErrno(errno, reading: true, path: path)
             }
         }
     }