(140820778) Darwin SearchPaths without expanding tilde produce non-tilde-based paths (#1069)

Author: jmschonfeld

Sources/FoundationEssentials/FileManager/SearchPaths/FileManager+SearchPaths.swift

@@ -57,20 +57,39 @@ extension FileManager.SearchPathDomainMask {
     }
 }
 
+func _SearchPathURLs(for directory: FileManager.SearchPathDirectory, in domain: FileManager.SearchPathDomainMask, expandTilde: Bool) -> some Sequence<URL> {
+    #if canImport(Darwin)
+    _DarwinSearchPaths(for: directory, in: domain, expandTilde: expandTilde).map {
+        URL(filePath: $0, directoryHint: .isDirectory)
+    }
+    #else
+    var result = Set<URL>()
+    var domain = domain.intersection(.valid)
+    while let currentDomain = domain.firstMask {
+        domain.remove(currentDomain)
+        #if os(Windows)
+        let url = _WindowsSearchPathURL(for: directory, in: currentDomain)
+        #else
+        let url = _XDGSearchPathURL(for: directory, in: currentDomain)
+        #endif
+        if let url {
+            result.insert(url)
+        }
+    }
+    return result
+    #endif
+}
+
+#if canImport(Darwin)
 #if FOUNDATION_FRAMEWORK
 @_cdecl("_NSSearchPathsForDirectoryInDomain")
-func _NSSearchPaths(for directory: FileManager.SearchPathDirectory, in domain: FileManager.SearchPathDomainMask, expandTilde: Bool) -> [String] {
-    _SearchPathURLs(for: directory, in: domain, expandTilde: expandTilde).map(\.path)
-}
 #endif
-
-func _SearchPathURLs(for directory: FileManager.SearchPathDirectory, in domain: FileManager.SearchPathDomainMask, expandTilde: Bool) -> some Sequence<URL> {
-    #if canImport(Darwin)
+func _DarwinSearchPaths(for directory: FileManager.SearchPathDirectory, in domain: FileManager.SearchPathDomainMask, expandTilde: Bool) -> [String] {
     let basic = _DarwinSearchPathsSequence(directory: directory, domainMask: domain.intersection(.valid)).lazy.map {
         if expandTilde {
-            return URL(filePath: $0.expandingTildeInPath, directoryHint: .isDirectory)
+            $0.expandingTildeInPath
         } else {
-            return URL(filePath: $0, directoryHint: .isDirectory)
+            $0
         }
     }
 
@@ -80,32 +99,17 @@ func _SearchPathURLs(for directory: FileManager.SearchPathDirectory, in domain:
     if domain.contains(._sharedUserDomainMask) || compatibleSharedUserDomainMask {
         var result = Array(basic)
         for path in _DarwinSearchPathsSequence(directory: directory, domainMask: .userDomainMask) {
-            let expandedURL = URL(filePath: expandTilde ? path.replacingTildeWithRealHomeDirectory : path, directoryHint: .isDirectory)
+            let expandedPath = expandTilde ? path.replacingTildeWithRealHomeDirectory : path
             // Avoid duplicates, which would occur with (NSUserDomainMask | NSSharedUserDomainMask) in non-sandboxed apps.
-            if !result.contains(expandedURL) {
+            if !result.contains(expandedPath) {
                 // Insert this path after NSUserDomainMask and before any of the more general paths.
                 let insertionIndex = domain.contains(.userDomainMask) ? 1 : 0
-                result.insert(expandedURL, at: insertionIndex)
+                result.insert(expandedPath, at: insertionIndex)
             }
         }
         return result
     }
     #endif
     return Array(basic)
-    #else
-    var result = Set<URL>()
-    var domain = domain.intersection(.valid)
-    while let currentDomain = domain.firstMask {
-        domain.remove(currentDomain)
-        #if os(Windows)
-        let url = _WindowsSearchPathURL(for: directory, in: currentDomain)
-        #else
-        let url = _XDGSearchPathURL(for: directory, in: currentDomain)
-        #endif
-        if let url {
-            result.insert(url)
-        }
-    }
-    return result
-    #endif
 }
+#endif

Tests/FoundationEssentialsTests/FileManager/FileManagerTests.swift

@@ -1049,6 +1049,16 @@ final class FileManagerTests : XCTestCase {
         XCTAssertEqual(FileManager.default.homeDirectory(forUser: UUID().uuidString), fallbackPath)
         #endif
     }
+    
+    func testSearchPathsWithoutExpandingTilde() throws {
+        #if !canImport(Darwin)
+        throw XCTSkip("This test is not applicable for this platform")
+        #else
+        for path in _DarwinSearchPaths(for: .libraryDirectory, in: .userDomainMask, expandTilde: false) {
+            XCTAssertTrue(path.starts(with: "~/"), "Path '\(path)' did not start with ~/ as expected")
+        }
+        #endif
+    }
 
     func testWindowsDirectoryCreationCrash() throws {
         try FileManagerPlayground {