Skip to content

Move constants from linux/magic.h out of gnu and uclibc #2633

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

Closed
wants to merge 1 commit into from
Closed
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
114 changes: 0 additions & 114 deletions src/unix/linux_like/linux/gnu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -846,120 +846,6 @@ pub const O_ACCMODE: ::c_int = 3;
pub const ST_RELATIME: ::c_ulong = 4096;
pub const NI_MAXHOST: ::socklen_t = 1025;

cfg_if! {
if #[cfg(not(target_arch = "s390x"))] {
pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
pub const FUSE_SUPER_MAGIC: ::c_long = 0x65735546;
pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
pub const SECURITYFS_MAGIC: ::c_long = 0x73636673;
pub const SELINUX_MAGIC: ::c_long = 0xf97cff8c;
pub const SMACK_MAGIC: ::c_long = 0x43415d53;
pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
pub const SYSFS_MAGIC: ::c_long = 0x62656572;
pub const TMPFS_MAGIC: ::c_long = 0x01021994;
pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;
} else if #[cfg(target_arch = "s390x")] {
pub const ADFS_SUPER_MAGIC: ::c_uint = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_uint = 0x0000adff;
pub const AFS_SUPER_MAGIC: ::c_uint = 0x5346414f;
pub const AUTOFS_SUPER_MAGIC: ::c_uint = 0x0187;
pub const BINDERFS_SUPER_MAGIC: ::c_uint = 0x6c6f6f70;
pub const BPF_FS_MAGIC: ::c_uint = 0xcafe4a11;
pub const BTRFS_SUPER_MAGIC: ::c_uint = 0x9123683e;
pub const CGROUP2_SUPER_MAGIC: ::c_uint = 0x63677270;
pub const CGROUP_SUPER_MAGIC: ::c_uint = 0x27e0eb;
pub const CODA_SUPER_MAGIC: ::c_uint = 0x73757245;
pub const CRAMFS_MAGIC: ::c_uint = 0x28cd3d45;
pub const DEBUGFS_MAGIC: ::c_uint = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: ::c_uint = 0x1cd1;
pub const ECRYPTFS_SUPER_MAGIC: ::c_uint = 0xf15f;
pub const EFS_SUPER_MAGIC: ::c_uint = 0x00414a53;
pub const EXT2_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const EXT3_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const EXT4_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const F2FS_SUPER_MAGIC: ::c_uint = 0xf2f52010;
pub const FUSE_SUPER_MAGIC: ::c_uint = 0x65735546;
pub const FUTEXFS_SUPER_MAGIC: ::c_uint = 0xbad1dea;
pub const HOSTFS_SUPER_MAGIC: ::c_uint = 0x00c0ffee;
pub const HPFS_SUPER_MAGIC: ::c_uint = 0xf995e849;
pub const HUGETLBFS_MAGIC: ::c_uint = 0x958458f6;
pub const ISOFS_SUPER_MAGIC: ::c_uint = 0x00009660;
pub const JFFS2_SUPER_MAGIC: ::c_uint = 0x000072b6;
pub const MINIX2_SUPER_MAGIC2: ::c_uint = 0x00002478;
pub const MINIX2_SUPER_MAGIC: ::c_uint = 0x00002468;
pub const MINIX3_SUPER_MAGIC: ::c_uint = 0x4d5a;
pub const MINIX_SUPER_MAGIC2: ::c_uint = 0x0000138f;
pub const MINIX_SUPER_MAGIC: ::c_uint = 0x0000137f;
pub const MSDOS_SUPER_MAGIC: ::c_uint = 0x00004d44;
pub const NCP_SUPER_MAGIC: ::c_uint = 0x0000564c;
pub const NFS_SUPER_MAGIC: ::c_uint = 0x00006969;
pub const NILFS_SUPER_MAGIC: ::c_uint = 0x3434;
pub const OCFS2_SUPER_MAGIC: ::c_uint = 0x7461636f;
pub const OPENPROM_SUPER_MAGIC: ::c_uint = 0x00009fa1;
pub const OVERLAYFS_SUPER_MAGIC: ::c_uint = 0x794c7630;
pub const PROC_SUPER_MAGIC: ::c_uint = 0x00009fa0;
pub const QNX4_SUPER_MAGIC: ::c_uint = 0x0000002f;
pub const QNX6_SUPER_MAGIC: ::c_uint = 0x68191122;
pub const RDTGROUP_SUPER_MAGIC: ::c_uint = 0x7655821;
pub const REISERFS_SUPER_MAGIC: ::c_uint = 0x52654973;
pub const SECURITYFS_MAGIC: ::c_uint = 0x73636673;
pub const SELINUX_MAGIC: ::c_uint = 0xf97cff8c;
pub const SMACK_MAGIC: ::c_uint = 0x43415d53;
pub const SMB_SUPER_MAGIC: ::c_uint = 0x0000517b;
pub const SYSFS_MAGIC: ::c_uint = 0x62656572;
pub const TMPFS_MAGIC: ::c_uint = 0x01021994;
pub const TRACEFS_MAGIC: ::c_uint = 0x74726163;
pub const UDF_SUPER_MAGIC: ::c_uint = 0x15013346;
pub const USBDEVICE_SUPER_MAGIC: ::c_uint = 0x00009fa2;
pub const XENFS_SUPER_MAGIC: ::c_uint = 0xabba1974;
pub const XFS_SUPER_MAGIC: ::c_uint = 0x58465342;
}
}

pub const CPU_SETSIZE: ::c_int = 0x400;

pub const PTRACE_TRACEME: ::c_uint = 0;
Expand Down
115 changes: 115 additions & 0 deletions src/unix/linux_like/linux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3161,6 +3161,121 @@ pub const CAN_RAW_RECV_OWN_MSGS: ::c_int = 4;
pub const CAN_RAW_FD_FRAMES: ::c_int = 5;
pub const CAN_RAW_JOIN_FILTERS: ::c_int = 6;

// linux/magic.h
cfg_if! {
if #[cfg(not(target_arch = "s390x"))] {
pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
pub const FUSE_SUPER_MAGIC: ::c_long = 0x65735546;
pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
pub const SECURITYFS_MAGIC: ::c_long = 0x73636673;
pub const SELINUX_MAGIC: ::c_long = 0xf97cff8c;
pub const SMACK_MAGIC: ::c_long = 0x43415d53;
pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
pub const SYSFS_MAGIC: ::c_long = 0x62656572;
pub const TMPFS_MAGIC: ::c_long = 0x01021994;
pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;
} else if #[cfg(target_arch = "s390x")] {
pub const ADFS_SUPER_MAGIC: ::c_uint = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_uint = 0x0000adff;
pub const AFS_SUPER_MAGIC: ::c_uint = 0x5346414f;
pub const AUTOFS_SUPER_MAGIC: ::c_uint = 0x0187;
pub const BINDERFS_SUPER_MAGIC: ::c_uint = 0x6c6f6f70;
pub const BPF_FS_MAGIC: ::c_uint = 0xcafe4a11;
pub const BTRFS_SUPER_MAGIC: ::c_uint = 0x9123683e;
pub const CGROUP2_SUPER_MAGIC: ::c_uint = 0x63677270;
pub const CGROUP_SUPER_MAGIC: ::c_uint = 0x27e0eb;
pub const CODA_SUPER_MAGIC: ::c_uint = 0x73757245;
pub const CRAMFS_MAGIC: ::c_uint = 0x28cd3d45;
pub const DEBUGFS_MAGIC: ::c_uint = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: ::c_uint = 0x1cd1;
pub const ECRYPTFS_SUPER_MAGIC: ::c_uint = 0xf15f;
pub const EFS_SUPER_MAGIC: ::c_uint = 0x00414a53;
pub const EXT2_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const EXT3_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const EXT4_SUPER_MAGIC: ::c_uint = 0x0000ef53;
pub const F2FS_SUPER_MAGIC: ::c_uint = 0xf2f52010;
pub const FUSE_SUPER_MAGIC: ::c_uint = 0x65735546;
pub const FUTEXFS_SUPER_MAGIC: ::c_uint = 0xbad1dea;
pub const HOSTFS_SUPER_MAGIC: ::c_uint = 0x00c0ffee;
pub const HPFS_SUPER_MAGIC: ::c_uint = 0xf995e849;
pub const HUGETLBFS_MAGIC: ::c_uint = 0x958458f6;
pub const ISOFS_SUPER_MAGIC: ::c_uint = 0x00009660;
pub const JFFS2_SUPER_MAGIC: ::c_uint = 0x000072b6;
pub const MINIX2_SUPER_MAGIC2: ::c_uint = 0x00002478;
pub const MINIX2_SUPER_MAGIC: ::c_uint = 0x00002468;
pub const MINIX3_SUPER_MAGIC: ::c_uint = 0x4d5a;
pub const MINIX_SUPER_MAGIC2: ::c_uint = 0x0000138f;
pub const MINIX_SUPER_MAGIC: ::c_uint = 0x0000137f;
pub const MSDOS_SUPER_MAGIC: ::c_uint = 0x00004d44;
pub const NCP_SUPER_MAGIC: ::c_uint = 0x0000564c;
pub const NFS_SUPER_MAGIC: ::c_uint = 0x00006969;
pub const NILFS_SUPER_MAGIC: ::c_uint = 0x3434;
pub const OCFS2_SUPER_MAGIC: ::c_uint = 0x7461636f;
pub const OPENPROM_SUPER_MAGIC: ::c_uint = 0x00009fa1;
pub const OVERLAYFS_SUPER_MAGIC: ::c_uint = 0x794c7630;
pub const PROC_SUPER_MAGIC: ::c_uint = 0x00009fa0;
pub const QNX4_SUPER_MAGIC: ::c_uint = 0x0000002f;
pub const QNX6_SUPER_MAGIC: ::c_uint = 0x68191122;
pub const RDTGROUP_SUPER_MAGIC: ::c_uint = 0x7655821;
pub const REISERFS_SUPER_MAGIC: ::c_uint = 0x52654973;
pub const SECURITYFS_MAGIC: ::c_uint = 0x73636673;
pub const SELINUX_MAGIC: ::c_uint = 0xf97cff8c;
pub const SMACK_MAGIC: ::c_uint = 0x43415d53;
pub const SMB_SUPER_MAGIC: ::c_uint = 0x0000517b;
pub const SYSFS_MAGIC: ::c_uint = 0x62656572;
pub const TMPFS_MAGIC: ::c_uint = 0x01021994;
pub const TRACEFS_MAGIC: ::c_uint = 0x74726163;
pub const UDF_SUPER_MAGIC: ::c_uint = 0x15013346;
pub const USBDEVICE_SUPER_MAGIC: ::c_uint = 0x00009fa2;
pub const XENFS_SUPER_MAGIC: ::c_uint = 0xabba1974;
pub const XFS_SUPER_MAGIC: ::c_uint = 0x58465342;
}
}

f! {
pub fn NLA_ALIGN(len: ::c_int) -> ::c_int {
return ((len) + NLA_ALIGNTO - 1) & !(NLA_ALIGNTO - 1)
Expand Down
51 changes: 0 additions & 51 deletions src/unix/linux_like/linux/uclibc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,57 +87,6 @@ pub const SIGEV_THREAD_ID: ::c_int = 4;

pub const AF_VSOCK: ::c_int = 40;

pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
pub const EXT2_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT3_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const EXT4_SUPER_MAGIC: ::c_long = 0x0000ef53;
pub const F2FS_SUPER_MAGIC: ::c_long = 0xf2f52010;
pub const FUTEXFS_SUPER_MAGIC: ::c_long = 0xbad1dea;
pub const HOSTFS_SUPER_MAGIC: ::c_long = 0x00c0ffee;
pub const HPFS_SUPER_MAGIC: ::c_long = 0xf995e849;
pub const HUGETLBFS_MAGIC: ::c_long = 0x958458f6;
pub const ISOFS_SUPER_MAGIC: ::c_long = 0x00009660;
pub const JFFS2_SUPER_MAGIC: ::c_long = 0x000072b6;
pub const MINIX2_SUPER_MAGIC2: ::c_long = 0x00002478;
pub const MINIX2_SUPER_MAGIC: ::c_long = 0x00002468;
pub const MINIX3_SUPER_MAGIC: ::c_long = 0x4d5a;
pub const MINIX_SUPER_MAGIC2: ::c_long = 0x0000138f;
pub const MINIX_SUPER_MAGIC: ::c_long = 0x0000137f;
pub const MSDOS_SUPER_MAGIC: ::c_long = 0x00004d44;
pub const NCP_SUPER_MAGIC: ::c_long = 0x0000564c;
pub const NFS_SUPER_MAGIC: ::c_long = 0x00006969;
pub const NILFS_SUPER_MAGIC: ::c_long = 0x3434;
pub const OCFS2_SUPER_MAGIC: ::c_long = 0x7461636f;
pub const OPENPROM_SUPER_MAGIC: ::c_long = 0x00009fa1;
pub const OVERLAYFS_SUPER_MAGIC: ::c_long = 0x794c7630;
pub const PROC_SUPER_MAGIC: ::c_long = 0x00009fa0;
pub const QNX4_SUPER_MAGIC: ::c_long = 0x0000002f;
pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
pub const SYSFS_MAGIC: ::c_long = 0x62656572;
pub const TMPFS_MAGIC: ::c_long = 0x01021994;
pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;
pub const XFS_SUPER_MAGIC: ::c_long = 0x58465342;

pub const PTRACE_TRACEME: ::c_int = 0;
pub const PTRACE_PEEKTEXT: ::c_int = 1;
pub const PTRACE_PEEKDATA: ::c_int = 2;
Expand Down