Merge pull request swiftlang#1994 from spevans/pr_more_fsrep

Author: swift-ci

Foundation/FileHandle.swift

@@ -782,8 +782,10 @@ extension FileHandle {
     }
 
     internal static func _openFileDescriptorForURL(_ url : URL, flags: Int32, reading: Bool) throws -> Int32 {
-        let path = url.path
-        let fd = _CFOpenFile(path, flags)
+        let fd = url.withUnsafeFileSystemRepresentation( { (fsRep) -> Int32 in
+            guard let fsRep = fsRep else { return -1 }
+            return _CFOpenFile(fsRep, flags)
+        })
         if fd < 0 {
             throw _NSErrorWithErrno(errno, reading: reading, url: url)
         }

Foundation/FileManager.swift

@@ -1450,61 +1450,58 @@ open class FileManager : NSObject {
 #if os(Windows)
         NSUnimplemented()
 #else
-        if rmdir(path) == 0 {
-            return
-        } else if errno == ENOTEMPTY {
-
-            let stream = URL(fileURLWithPath: path).withUnsafeFileSystemRepresentation { (fsRep) -> UnsafeMutablePointer<FTS>? in
+        try _fileSystemRepresentation(withPath: path, { fsRep in
+            if rmdir(fsRep) == 0 {
+                return
+            } else if errno == ENOTEMPTY {
                 let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
                 ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
                 ps.advanced(by: 1).initialize(to: nil)
-                defer {
-                    ps.deinitialize(count: 2)
-                    ps.deallocate()
-                }
-                return fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
-            }
-            
-            if stream != nil {
-                defer {
-                    fts_close(stream)
-                }
+                let stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
+                ps.deinitialize(count: 2)
+                ps.deallocate()
 
-                while let current = fts_read(stream)?.pointee {
-                    let itemPath = string(withFileSystemRepresentation: current.fts_path, length: Int(current.fts_pathlen))
-                    guard alreadyConfirmed || shouldRemoveItemAtPath(itemPath, isURL: isURL) else {
-                        continue
+                if stream != nil {
+                    defer {
+                        fts_close(stream)
                     }
-                    
-                    do {
-                        switch Int32(current.fts_info) {
-                        case FTS_DEFAULT, FTS_F, FTS_NSOK, FTS_SL, FTS_SLNONE:
-                            if unlink(current.fts_path) == -1 {
-                                throw _NSErrorWithErrno(errno, reading: false, path: itemPath)
+
+                    while let current = fts_read(stream)?.pointee {
+                        let itemPath = string(withFileSystemRepresentation: current.fts_path, length: Int(current.fts_pathlen))
+                        guard alreadyConfirmed || shouldRemoveItemAtPath(itemPath, isURL: isURL) else {
+                            continue
+                        }
+
+                        do {
+                            switch Int32(current.fts_info) {
+                            case FTS_DEFAULT, FTS_F, FTS_NSOK, FTS_SL, FTS_SLNONE:
+                                if unlink(current.fts_path) == -1 {
+                                    throw _NSErrorWithErrno(errno, reading: false, path: itemPath)
+                                }
+                            case FTS_DP:
+                                if rmdir(current.fts_path) == -1 {
+                                    throw _NSErrorWithErrno(errno, reading: false, path: itemPath)
+                                }
+                            case FTS_DNR, FTS_ERR, FTS_NS:
+                                throw _NSErrorWithErrno(current.fts_errno, reading: false, path: itemPath)
+                            default:
+                                break
                             }
-                        case FTS_DP:
-                            if rmdir(current.fts_path) == -1 {
-                                throw _NSErrorWithErrno(errno, reading: false, path: itemPath)
+                        } catch {
+                            if !shouldProceedAfterError(error, removingItemAtPath: itemPath, isURL: isURL) {
+                                throw error
                             }
-                        case FTS_DNR, FTS_ERR, FTS_NS:
-                            throw _NSErrorWithErrno(current.fts_errno, reading: false, path: itemPath)
-                        default:
-                            break
-                        }
-                    } catch {
-                        if !shouldProceedAfterError(error, removingItemAtPath: itemPath, isURL: isURL) {
-                            throw error
                         }
                     }
+                } else {
+                    let _ = _NSErrorWithErrno(ENOTEMPTY, reading: false, path: path)
                 }
-            } else {
-                let _ = _NSErrorWithErrno(ENOTEMPTY, reading: false, path: path)
+            } else if errno != ENOTDIR {
+                throw _NSErrorWithErrno(errno, reading: false, path: path)
+            } else if unlink(fsRep) != 0 {
+                throw _NSErrorWithErrno(errno, reading: false, path: path)
             }
-        } else if errno != ENOTDIR {
-            throw _NSErrorWithErrno(errno, reading: false, path: path)
-        } else if _fileSystemRepresentation(withPath: path, { unlink($0) != 0 }) {
-            throw _NSErrorWithErrno(errno, reading: false, path: path)
-        }
+        })
 #endif
     }