Skip to content

linux(musl): deprecate LFS64 bindings #5170

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

Open
dybucc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

linux(musl): deprecate LFS64 bindings #5170

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
7 changes: 7 additions & 0 deletions src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub type dev_t = u64;
pub type socklen_t = u32;
pub type mode_t = u32;
pub type ino64_t = u64;
// FIXME(1.0,deprecate): lfs binding to be removed
pub type off64_t = i64;
pub type blkcnt64_t = i64;
pub type rlim64_t = u64;
Expand Down Expand Up @@ -3479,7 +3480,10 @@ extern "C" {
pub fn fallocate(fd: c_int, mode: c_int, offset: off_t, len: off_t) -> c_int;
#[cfg_attr(gnu_file_offset_bits64, link_name = "posix_fallocate64")]
pub fn posix_fallocate(fd: c_int, offset: off_t, len: off_t) -> c_int;
#[cfg(not(any(target_env = "musl", target_env = "ohos")))]
pub fn readahead(fd: c_int, offset: off64_t, count: size_t) -> ssize_t;
#[cfg(any(target_env = "musl", target_env = "ohos"))]
pub fn readahead(fd: c_int, offset: off_t, count: size_t) -> ssize_t;
pub fn getxattr(
path: *const c_char,
name: *const c_char,
Expand Down Expand Up @@ -3567,7 +3571,10 @@ extern "C" {

// Not available now on Android
pub fn mkfifoat(dirfd: c_int, pathname: *const c_char, mode: mode_t) -> c_int;
#[cfg(not(any(target_env = "musl", target_env = "ohos")))]
pub fn sync_file_range(fd: c_int, offset: off64_t, nbytes: off64_t, flags: c_uint) -> c_int;
#[cfg(any(target_env = "musl", target_env = "ohos"))]
pub fn sync_file_range(fd: c_int, offset: off_t, nbytes: off_t, flags: c_uint) -> c_int;

pub fn posix_madvise(addr: *mut c_void, len: size_t, advice: c_int) -> c_int;

Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b32/arm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use crate::prelude::*;

pub type wchar_t = u32;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
1 change: 0 additions & 1 deletion src/unix/linux_like/linux/musl/b32/hexagon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::prelude::*;

pub type wchar_t = u32;
pub type stat64 = crate::stat;

s! {
pub struct stat {
Expand Down
3 changes: 1 addition & 2 deletions src/unix/linux_like/linux/musl/b32/mips/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use crate::prelude::*;

pub type wchar_t = c_int;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down Expand Up @@ -140,6 +138,7 @@ s! {
pub f_spare: [c_ulong; 5],
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct statfs64 {
pub f_type: c_ulong,
pub f_bsize: c_ulong,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b32/powerpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use crate::prelude::*;

pub type wchar_t = i32;

pub type stat64 = stat;

s! {
pub struct termios {
pub c_iflag: crate::tcflag_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ use crate::prelude::*;

pub type wchar_t = c_int;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b32/x86/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use crate::prelude::*;

pub type wchar_t = i32;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ pub type wchar_t = u32;
pub type nlink_t = u32;
pub type blksize_t = c_int;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ pub type wchar_t = c_int;
pub type nlink_t = c_uint;
pub type blksize_t = c_int;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
3 changes: 1 addition & 2 deletions src/unix/linux_like/linux/musl/b64/mips64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ pub type wchar_t = i32;
pub type nlink_t = c_uint;
pub type blksize_t = i64;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down Expand Up @@ -89,6 +87,7 @@ s! {
pub f_spare: [c_ulong; 5],
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct statfs64 {
pub f_type: c_ulong,
pub f_bsize: c_ulong,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/powerpc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ pub type wchar_t = i32;
pub type nlink_t = u64;
pub type blksize_t = c_long;

pub type stat64 = stat;

s! {
pub struct termios {
pub c_iflag: crate::tcflag_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ pub type wchar_t = c_int;
pub type nlink_t = c_uint;
pub type blksize_t = c_int;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
3 changes: 2 additions & 1 deletion src/unix/linux_like/linux/musl/b64/s390x.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ pub type blksize_t = i64;
pub type nlink_t = u64;
pub type wchar_t = i32;
pub type greg_t = u64;

// FIXME(1.0,deprecate): lfs binding to be removed
pub type statfs64 = statfs;
pub type stat64 = stat;

s! {
pub struct ipc_perm {
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/wasm32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ pub type wchar_t = i32;
pub type nlink_t = u64;
pub type blksize_t = c_long;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
2 changes: 0 additions & 2 deletions src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ pub type nlink_t = u64;
pub type blksize_t = c_long;
pub type greg_t = i64;

pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: crate::dev_t,
Expand Down
13 changes: 11 additions & 2 deletions src/unix/linux_like/linux/musl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ pub type shmatt_t = c_ulong;
pub type msgqnum_t = c_ulong;
pub type msglen_t = c_ulong;
pub type fsblkcnt_t = c_ulonglong;
pub type fsblkcnt64_t = c_ulonglong;
pub type fsfilcnt_t = c_ulonglong;
pub type fsfilcnt64_t = c_ulonglong;
pub type rlim_t = c_ulonglong;

// FIXME(1.0,deprecate): lfs binding to be removed
pub type fsblkcnt64_t = c_ulonglong;
// FIXME(1.0,deprecate): lfs binding to be removed
pub type fsfilcnt64_t = c_ulonglong;
// FIXME(1.0,deprecate): lfs binding to be removed
pub type stat64 = stat;

cfg_if! {
if #[cfg(doc)] {
// Used in `linux::arch` to define ioctl constants.
Expand Down Expand Up @@ -191,6 +196,7 @@ s! {
__f_reserved: Padding<[c_int; 6]>,
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct statvfs64 {
pub f_bsize: c_ulong,
pub f_frsize: c_ulong,
Expand Down Expand Up @@ -232,6 +238,7 @@ s! {
pub l_pid: crate::pid_t,
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct flock64 {
pub l_type: c_short,
pub l_whence: c_short,
Expand Down Expand Up @@ -398,6 +405,7 @@ s! {
}

// MIPS/s390x implementation is special (see arch folders)
// FIXME(1.0,deprecate): lfs binding to be removed
#[cfg(not(any(target_arch = "mips", target_arch = "mips64", target_arch = "s390x")))]
pub struct statfs64 {
pub f_type: c_ulong,
Expand Down Expand Up @@ -887,6 +895,7 @@ extern "C" {
}

// Alias <foo> to <foo>64 to mimic glibc's LFS64 support
// FIXME(1.0,deprecate): lfs binding to be removed
mod lfs64;
pub use self::lfs64::*;

Expand Down
15 changes: 14 additions & 1 deletion src/unix/linux_like/linux_l4re_shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub type iconv_t = *mut c_void;
cfg_if! {
if #[cfg(not(target_env = "gnu"))] {
extern_ty! {
// FIXME(1.0,deprecate): lfs binding to be removed
pub type fpos64_t; // FIXME(linux): fill this out with a struct
}
}
Expand Down Expand Up @@ -283,6 +284,7 @@ s! {
pub val: c_int,
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct rlimit64 {
pub rlim_cur: crate::rlim64_t,
pub rlim_max: crate::rlim64_t,
Expand All @@ -305,6 +307,7 @@ s! {
pub d_name: [c_char; 256],
}

// FIXME(1.0,deprecate): lfs binding to be removed
pub struct dirent64 {
pub d_ino: crate::ino64_t,
pub d_off: crate::off64_t,
Expand Down Expand Up @@ -1926,7 +1929,7 @@ extern "C" {
longindex: *mut c_int,
) -> c_int;

#[cfg(not(target_env = "uclibc"))]
#[cfg(not(any(target_env = "uclibc", target_env = "musl", target_env = "ohos")))]
pub fn copy_file_range(
fd_in: c_int,
off_in: *mut crate::off64_t,
Expand All @@ -1935,6 +1938,16 @@ extern "C" {
len: size_t,
flags: c_uint,
) -> ssize_t;

#[cfg(any(target_env = "musl", target_env = "ohos"))]
pub fn copy_file_range(
fd_in: c_int,
off_in: *mut crate::off_t,
fd_out: c_int,
off_out: *mut crate::off_t,
len: size_t,
flags: c_uint,
) -> ssize_t;
}

cfg_if! {
Expand Down
Loading