Skip to content

Work around Android nullability errors #3279

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
glbrntt merged 1 commit into from
Jul 1, 2025
Merged

Work around Android nullability errors #3279

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions Sources/CNIOLinux/include/CNIOLinux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,8 @@ extern const unsigned long CNIOLinux_UTIME_NOW;

extern const long CNIOLinux_UDP_MAX_SEGMENTS;

// A workaround for incorrect nullability annotations in the Android SDK.
FTS *CNIOLinux_fts_open(char * const *path_argv, int options, int (*compar)(const FTSENT **, const FTSENT **));

#endif
#endif
4 changes: 4 additions & 0 deletions Sources/CNIOLinux/shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,8 @@ const unsigned long CNIOLinux_UTIME_NOW = UTIME_NOW;
const long CNIOLinux_UDP_MAX_SEGMENTS = UDP_MAX_SEGMENTS;
#endif
const long CNIOLinux_UDP_MAX_SEGMENTS = -1;

FTS *CNIOLinux_fts_open(char * const *path_argv, int options, int (*compar)(const FTSENT **, const FTSENT **)) {
fts_open(path_argv, options, compar);
}
#endif
7 changes: 7 additions & 0 deletions Sources/NIOFileSystem/Internal/System Calls/Syscalls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,14 @@ internal func libc_fts_open(
_ path: [UnsafeMutablePointer<CInterop.PlatformChar>?],
_ options: CInt
) -> UnsafeMutablePointer<CInterop.FTS> {
#if os(Android)
// This branch is a workaround for incorrect nullability annotations in the Android SDK.
// They were added in https://android.googlesource.com/platform/bionic/+/dec8efd72a6ad8b807a15a614ae1519487cfa456,
// and lasted for more than a year: https://android.googlesource.com/platform/bionic/+/da81ec4d1cbd0279014feb60535bf38defcd9346.
CNIOLinux_fts_open(path, options, nil)!
#else
fts_open(path, options, nil)!
#endif
}

/// fts(3)
Expand Down
Loading