Skip to content

Merge main into release/6.2 #5229

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 2 commits into from
Jul 1, 2025
Merged

Merge main into release/6.2 #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e17c61c
Instead of crashing with unknown types in print, use description (#5207)
parkera Jun 26, 2025
ae61520
Stylistic changes to _CFPosixSpawnFileActionsChdir implementation (#5…
jakepetroules Jun 28, 2025
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
6 changes: 4 additions & 2 deletions Sources/CoreFoundation/CFPlatform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2321,11 +2321,13 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
// Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
// - Amazon Linux 2 (EoL mid-2025)
return ENOSYS;
#elif defined(__OpenBSD__) || defined(__QNX__) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
#elif defined(__ANDROID__) && __ANDROID_API__ < 34
// Android versions prior to 14 (API level 34) don't support posix_spawn_file_actions_addchdir_np
return ENOSYS;
#elif defined(__OpenBSD__) || defined(__QNX__)
// Currently missing as of:
// - OpenBSD 7.5 (April 2024)
// - QNX 8 (December 2023)
// - Android 13
return ENOSYS;
#elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
// Pre-standard posix_spawn_file_actions_addchdir_np version available in:
Expand Down
4 changes: 3 additions & 1 deletion Sources/plutil/PLUContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,9 @@ struct PrintCommand {
let description = number.description
result.append("\(description)\n")
} else {
throw PLUContextError.argument("Unknown property list type")
// Use a generic description
result.append(String(describing: value))
result.append("\n")
}
return result
}
Expand Down