openbsd: fix width bug for ioctl builder

Author: qinghon

libc-test/semver/netbsd.txt

@@ -1128,6 +1128,7 @@ XATTR_REPLACE
 YESEXPR
 YESSTR
 _IO
+_IOC
 _IOFBF
 _IOLBF
 _IONBF

libc-test/semver/openbsd.txt

@@ -917,9 +917,14 @@ WSTOPPED
 WTRAPPED
 YESEXPR
 YESSTR
+_IO
+_IOC
 _IOFBF
 _IOLBF
 _IONBF
+_IOR
+_IOW
+_IOWR
 _MAX_PAGE_SHIFT
 _PC_2_SYMLINKS
 _PC_ALLOC_SIZE_MIN

src/unix/bsd/netbsdlike/mod.rs

@@ -442,29 +442,29 @@ pub const MNT_QUOTA: c_int = 0x00002000;
 // sys/ioccom.h in NetBSD and OpenBSD
 pub const IOCPARM_MASK: u32 = 0x1fff;
 
-pub const IOC_VOID: u32 = 0x20000000;
-pub const IOC_OUT: u32 = 0x40000000;
-pub const IOC_IN: u32 = 0x80000000;
-pub const IOC_INOUT: u32 = IOC_IN | IOC_OUT;
-pub const IOC_DIRMASK: u32 = 0xe0000000;
+pub const IOC_VOID: c_ulong = 0x20000000;
+pub const IOC_OUT: c_ulong = 0x40000000;
+pub const IOC_IN: c_ulong = 0x80000000;
+pub const IOC_INOUT: c_ulong = IOC_IN | IOC_OUT;
+pub const IOC_DIRMASK: c_ulong = 0xe0000000;
 
-pub const fn _IO(g: u32, n: u32) -> u32 {
+pub const fn _IO(g: c_ulong, n: c_ulong) -> c_ulong {
     _IOC(IOC_VOID, g, n, 0)
 }
 
 /// Build an ioctl number for an read-only ioctl.
-pub const fn _IOR<T>(g: u32, n: u32) -> u32 {
-    _IOC(IOC_OUT, g, n, mem::size_of::<T>() as u32)
+pub const fn _IOR<T>(g: c_ulong, n: c_ulong) -> c_ulong {
+    _IOC(IOC_OUT, g, n, mem::size_of::<T>() as c_ulong)
 }
 
 /// Build an ioctl number for an write-only ioctl.
-pub const fn _IOW<T>(g: u32, n: u32) -> u32 {
-    _IOC(IOC_IN, g, n, mem::size_of::<T>() as u32)
+pub const fn _IOW<T>(g: c_ulong, n: c_ulong) -> c_ulong {
+    _IOC(IOC_IN, g, n, mem::size_of::<T>() as c_ulong)
 }
 
 /// Build an ioctl number for a read-write ioctl.
-pub const fn _IOWR<T>(g: u32, n: u32) -> u32 {
-    _IOC(IOC_INOUT, g, n, mem::size_of::<T>() as u32)
+pub const fn _IOWR<T>(g: c_ulong, n: c_ulong) -> c_ulong {
+    _IOC(IOC_INOUT, g, n, mem::size_of::<T>() as c_ulong)
 }
 
 pub const AF_UNSPEC: c_int = 0;

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -1850,7 +1850,7 @@ pub const MNT_WAIT: c_int = 1;
 pub const MNT_NOWAIT: c_int = 2;
 pub const MNT_LAZY: c_int = 3;
 
-// sys/ioccom.h 
+// sys/ioccom.h
 pub const IOCPARM_SHIFT: u32 = 16;
 pub const IOCGROUP_SHIFT: u32 = 8;
 
@@ -1865,8 +1865,9 @@ pub const fn IOCBASECMD(x: u32) -> u32 {
 pub const fn IOCGROUP(x: u32) -> u32 {
     (x >> IOCGROUP_SHIFT) & 0xff
 }
-pub const fn _IOC(inout: u32, group: u32, num: u32, len: u32) -> u32 {
-    (inout) | (((len) & crate::IOCPARM_MASK) << IOCPARM_SHIFT) | ((group) << IOCGROUP_SHIFT) | (num)
+
+pub const fn _IOC(inout: c_ulong, group: c_ulong, num: c_ulong, len: c_ulong) -> c_ulong {
+    (inout) | (((len) & crate::IOCPARM_MASK as c_ulong) << IOCPARM_SHIFT) | ((group) << IOCGROUP_SHIFT) | (num)
 }
 
 //<sys/timex.h>

src/unix/bsd/netbsdlike/openbsd/mod.rs

@@ -1804,7 +1804,7 @@ pub const PF_R: u32 = 0x4;
 pub const PF_MASKOS: u32 = 0x0ff00000;
 pub const PF_MASKPROC: u32 = 0xf0000000;
 
-// sys/ioccom.h 
+// sys/ioccom.h
 pub const fn IOCPARM_LEN(x: u32) -> u32 {
     (x >> 16) & crate::IOCPARM_MASK
 }
@@ -1816,11 +1816,11 @@ pub const fn IOCBASECMD(x: u32) -> u32 {
 pub const fn IOCGROUP(x: u32) -> u32 {
     (x >> 8) & 0xff
 }
-pub const fn _IOC(inout: u32, group: u32, num: u32, len: u32) -> u32 {
+
+pub const fn _IOC(inout: c_ulong, group: c_ulong, num: c_ulong, len: c_ulong) -> c_ulong {
     (inout) | (((len) & crate::IOCPARM_MASK) << 16) | ((group) << 8) | (num)
 }
 
-
 // sys/mount.h
 pub const MNT_NOPERM: c_int = 0x00000020;
 pub const MNT_WXALLOWED: c_int = 0x00000800;