Skip to content
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.

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

Restore thread-unsafe fallback for setting the Process working directory #5090

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Changes from all commits
Commits
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
30 changes: 29 additions & 1 deletion Sources/Foundation/Process.swift
Original file line number Diff line number Diff line change
Expand Up @@ -925,8 +925,15 @@ open class Process: NSObject, @unchecked Sendable {
for fd in addclose.filter({ $0 >= 0 }) {
try _throwIfPosixError(_CFPosixSpawnFileActionsAddClose(fileActions, fd))
}
let useFallbackChdir: Bool
if let dir = currentDirectoryURL?.path {
try _throwIfPosixError(_CFPosixSpawnFileActionsChdir(fileActions, dir))
let chdirResult = _CFPosixSpawnFileActionsChdir(fileActions, dir)
useFallbackChdir = chdirResult == ENOSYS
if !useFallbackChdir {
try _throwIfPosixError(chdirResult)
}
} else {
useFallbackChdir = false
}

#if canImport(Darwin) || os(Android) || os(OpenBSD)
Expand All @@ -950,6 +957,27 @@ open class Process: NSObject, @unchecked Sendable {
}
#endif

// Unsafe fallback for systems missing posix_spawn_file_actions_addchdir[_np]
// This includes Glibc versions older than 2.29 such as on Amazon Linux 2
let previousDirectoryPath: String?
if useFallbackChdir {
let fileManager = FileManager()
previousDirectoryPath = fileManager.currentDirectoryPath
if let dir = currentDirectoryURL?.path, !fileManager.changeCurrentDirectoryPath(dir) {
throw _NSErrorWithErrno(errno, reading: true, url: currentDirectoryURL)
}
} else {
previousDirectoryPath = nil
}

defer {
if let previousDirectoryPath {
// Reset the previous working directory path.
let fileManager = FileManager()
_ = fileManager.changeCurrentDirectoryPath(previousDirectoryPath)
}
}

// Launch
var pid = pid_t()

Expand Down