Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum PosixSpawnFileActionsCloseFrom {
startingAt minimumFileDescriptor: Int32) throws
{
#if canImport(Glibc)
try self.check(posix_spawn_file_actions_addclosefrom_np(&fileActions, minimumFileDescriptor))
try self.check(PosixSpawnFileActionsCompatibility.addCloseFrom(&fileActions, startingAt: minimumFileDescriptor))
#else
for descriptor in try self.descriptorsToClose(startingAt: minimumFileDescriptor) {
try self.check(posix_spawn_file_actions_addclose(&fileActions, descriptor))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#if canImport(Darwin)
import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif canImport(Musl)
import Musl
#endif

#if canImport(Darwin)
typealias PosixSpawnFileActionsHandle = posix_spawn_file_actions_t?
#else
typealias PosixSpawnFileActionsHandle = posix_spawn_file_actions_t
#endif

#if canImport(Glibc)
@_silgen_name("posix_spawn_file_actions_addchdir_np")
private func glibc_posix_spawn_file_actions_addchdir_np(
_ actions: UnsafeMutablePointer<posix_spawn_file_actions_t>,
_ path: UnsafePointer<CChar>) -> Int32

@_silgen_name("posix_spawn_file_actions_addclosefrom_np")
private func glibc_posix_spawn_file_actions_addclosefrom_np(
_ actions: UnsafeMutablePointer<posix_spawn_file_actions_t>,
_ fileDescriptor: Int32) -> Int32
#endif

enum PosixSpawnFileActionsCompatibility {
static func addChangeDirectory(
_ fileActions: inout PosixSpawnFileActionsHandle,
path: UnsafePointer<CChar>) -> Int32
{
#if canImport(Glibc)
glibc_posix_spawn_file_actions_addchdir_np(&fileActions, path)
#else
posix_spawn_file_actions_addchdir_np(&fileActions, path)
#endif
}

#if canImport(Glibc)
static func addCloseFrom(
_ fileActions: inout PosixSpawnFileActionsHandle,
startingAt minimumFileDescriptor: Int32) -> Int32
{
glibc_posix_spawn_file_actions_addclosefrom_np(&fileActions, minimumFileDescriptor)
}
#endif
}
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ package final class SpawnedProcessGroup: @unchecked Sendable {
}
if let workingDirectory {
fileActionResults.append(workingDirectory.path.withCString { path in
posix_spawn_file_actions_addchdir_np(&fileActions, path)
PosixSpawnFileActionsCompatibility.addChangeDirectory(&fileActions, path: path)
})
}
#if canImport(Glibc) || canImport(Musl)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ struct AntigravityPTYProcessLauncher: AntigravityCLIProcessLaunching {

let homeDirectory = NSHomeDirectory()
_ = homeDirectory.withCString { path in
posix_spawn_file_actions_addchdir_np(&fileActions, path)
PosixSpawnFileActionsCompatibility.addChangeDirectory(&fileActions, path: path)
}
#if canImport(Glibc) || canImport(Musl)
do {
Expand Down