Skip to content

FileManager: repair homeDirectoryForCurrentUser on Windows #4695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2023
Merged

FileManager: repair homeDirectoryForCurrentUser on Windows #4695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Sources/Foundation/FileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@ open class FileManager : NSObject {
}

open var homeDirectoryForCurrentUser: URL {
return homeDirectory(forUser: NSUserName())!
CFCopyHomeDirectoryURLForUser(nil)!.takeRetainedValue()._swiftObject
}

open var temporaryDirectory: URL {
Expand All @@ -1149,8 +1149,13 @@ open class FileManager : NSObject {

open func homeDirectory(forUser userName: String) -> URL? {
guard !userName.isEmpty else { return nil }
guard let url = CFCopyHomeDirectoryURLForUser(userName._cfObject) else { return nil }
return url.takeRetainedValue()._swiftObject
// Prefer to take the `CFCopyHomeDirectoryURLForUser` path for the
// current user.
return CFCopyHomeDirectoryURLForUser(userName == NSUserName()
? nil
: userName._cfObject)?
.takeRetainedValue()
._swiftObject
}
}

Expand Down