Merge pull request #4892 from kateinoigakukun/pr-6e9074ea384bd084677297a09372a39cbf105765

Author: kateinoigakukun

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -578,6 +578,10 @@ static inline int _direntNameLength(struct dirent *entry) {
 #endif
 }
 
+static inline char *_direntName(struct dirent *entry) {
+    return entry->d_name;
+}
+
 // major() and minor() might be implemented as macros or functions.
 static inline unsigned int _dev_major(dev_t rdev) {
 #if !TARGET_OS_WASI

Sources/Foundation/FileManager+POSIX.swift

@@ -449,10 +449,8 @@ extension FileManager {
             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)
-                }
+                let namePtr = UnsafeRawPointer(_direntName(entry)).assumingMemoryBound(to: CChar.self)
+                let entryName = string(withFileSystemRepresentation: namePtr, length: length)
                 if entryName != "." && entryName != ".." {
                     let entryType = Int32(entry.pointee.d_type)
                     try closure(entryName, entryType)