Merge pull request managarm#1345 from 48cf/hi

Missing defines and some rust-libc fixes

Author: Dennisbonke

abis/linux/statvfs.h

@@ -6,7 +6,15 @@
 
 #define ST_RDONLY 1
 #define ST_NOSUID 2
+#define ST_NODEV 4
+#define ST_NOEXEC 8
+#define ST_SYNCHRONOUS 16
 #define ST_MANDLOCK 64
+#define ST_WRITE 128
+#define ST_APPEND 256
+#define ST_IMMUTABLE 512
+#define ST_NOATIME 1024
+#define ST_NODIRATIME 2048
 
 /* On Linux, this struct is not directly used by the kernel. */
 

options/glibc/include/sys/ioctl.h

@@ -21,6 +21,10 @@ int ioctl(int __fd, unsigned long __request, ...);
 
 #endif /* !__MLIBC_ABI_ONLY */
 
+#define TIOCMGET 0x5415
+#define TIOCMBIS 0x5416
+#define TIOCMBIC 0x5417
+
 #define FIONREAD 0x541B
 #define FIONBIO 0x5421
 #define FIONCLEX 0x5450

options/posix/include/termios.h

@@ -66,6 +66,12 @@ extern "C" {
 
 #define TIOCM_DTR 0x002
 #define TIOCM_RTS 0x004
+#define TIOCM_CTS 0x020
+#define TIOCM_CAR 0x040
+#define TIOCM_RNG 0x080
+#define TIOCM_DSR 0x100
+#define TIOCM_RI TIOCM_RNG
+#define TIOCM_CD TIOCM_CAR
 
 #ifndef __MLIBC_ABI_ONLY
 

scripts/rust-libc-config.yml

@@ -2009,6 +2009,17 @@ force_macro_type:
     - "SA_RESETHAND"
     - "SA_RESTART"
     - "SA_SIGINFO"
+    - "ST_RDONLY"
+    - "ST_NOSUID"
+    - "ST_NODEV"
+    - "ST_NOEXEC"
+    - "ST_SYNCHRONOUS"
+    - "ST_MANDLOCK"
+    - "ST_WRITE"
+    - "ST_APPEND"
+    - "ST_IMMUTABLE"
+    - "ST_NOATIME"
+    - "ST_NODIRATIME"
   "c_uint":
     - "IGNBRK"
     - "BRKINT"
@@ -2028,8 +2039,10 @@ force_macro_type:
     - "POLLWRBAND"
   "usize":
     - "NCCS"
-    - "VEOF"
     - "PTHREAD_STACK_MIN"
+    - "VEOF"
+    - "VMIN"
+    - "VTIME"
   "crate::speed_t":
     - "B0"
     - "B50"
@@ -2065,6 +2078,9 @@ force_macro_type:
   "crate::tcflag_t":
     - "BS1"
     - "BSDLY"
+    - "CBAUD"
+    - "CBAUDEX"
+    - "CIBAUD"
     - "CLOCAL"
     - "CMSPAR"
     - "CR1"

scripts/rust-libc-header.rs

@@ -174,3 +174,78 @@ impl siginfo_t {
         self.sifields().fields[0]
     }
 }
+
+s! {
+    pub struct sockaddr_nl {
+        pub nl_family: crate::sa_family_t,
+        nl_pad: c_ushort,
+        pub nl_pid: u32,
+        pub nl_groups: u32,
+    }
+}
+
+// linux/netlink.h
+pub const NLA_ALIGNTO: c_int = 4;
+
+pub const NETLINK_ROUTE: c_int = 0;
+pub const NETLINK_UNUSED: c_int = 1;
+pub const NETLINK_USERSOCK: c_int = 2;
+pub const NETLINK_FIREWALL: c_int = 3;
+pub const NETLINK_SOCK_DIAG: c_int = 4;
+pub const NETLINK_NFLOG: c_int = 5;
+pub const NETLINK_XFRM: c_int = 6;
+pub const NETLINK_SELINUX: c_int = 7;
+pub const NETLINK_ISCSI: c_int = 8;
+pub const NETLINK_AUDIT: c_int = 9;
+pub const NETLINK_FIB_LOOKUP: c_int = 10;
+pub const NETLINK_CONNECTOR: c_int = 11;
+pub const NETLINK_NETFILTER: c_int = 12;
+pub const NETLINK_IP6_FW: c_int = 13;
+pub const NETLINK_DNRTMSG: c_int = 14;
+pub const NETLINK_KOBJECT_UEVENT: c_int = 15;
+pub const NETLINK_GENERIC: c_int = 16;
+pub const NETLINK_SCSITRANSPORT: c_int = 18;
+pub const NETLINK_ECRYPTFS: c_int = 19;
+pub const NETLINK_RDMA: c_int = 20;
+pub const NETLINK_CRYPTO: c_int = 21;
+pub const NETLINK_INET_DIAG: c_int = NETLINK_SOCK_DIAG;
+
+pub const NLM_F_REQUEST: c_int = 1;
+pub const NLM_F_MULTI: c_int = 2;
+pub const NLM_F_ACK: c_int = 4;
+pub const NLM_F_ECHO: c_int = 8;
+pub const NLM_F_DUMP_INTR: c_int = 16;
+pub const NLM_F_DUMP_FILTERED: c_int = 32;
+
+pub const NLM_F_ROOT: c_int = 0x100;
+pub const NLM_F_MATCH: c_int = 0x200;
+pub const NLM_F_ATOMIC: c_int = 0x400;
+pub const NLM_F_DUMP: c_int = NLM_F_ROOT | NLM_F_MATCH;
+
+pub const NLM_F_REPLACE: c_int = 0x100;
+pub const NLM_F_EXCL: c_int = 0x200;
+pub const NLM_F_CREATE: c_int = 0x400;
+pub const NLM_F_APPEND: c_int = 0x800;
+
+pub const NLM_F_NONREC: c_int = 0x100;
+pub const NLM_F_BULK: c_int = 0x200;
+
+pub const NLM_F_CAPPED: c_int = 0x100;
+pub const NLM_F_ACK_TLVS: c_int = 0x200;
+
+pub const NETLINK_ADD_MEMBERSHIP: c_int = 1;
+pub const NETLINK_DROP_MEMBERSHIP: c_int = 2;
+pub const NETLINK_PKTINFO: c_int = 3;
+pub const NETLINK_BROADCAST_ERROR: c_int = 4;
+pub const NETLINK_NO_ENOBUFS: c_int = 5;
+pub const NETLINK_RX_RING: c_int = 6;
+pub const NETLINK_TX_RING: c_int = 7;
+pub const NETLINK_LISTEN_ALL_NSID: c_int = 8;
+pub const NETLINK_LIST_MEMBERSHIPS: c_int = 9;
+pub const NETLINK_CAP_ACK: c_int = 10;
+pub const NETLINK_EXT_ACK: c_int = 11;
+pub const NETLINK_GET_STRICT_CHK: c_int = 12;
+
+pub const NLA_F_NESTED: c_int = 1 << 15;
+pub const NLA_F_NET_BYTEORDER: c_int = 1 << 14;
+pub const NLA_TYPE_MASK: c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);

scripts/rust-libc.py

@@ -80,11 +80,11 @@ def convert_ptr_type(self, c, ty, is_pointee=False):
             ret_type = Type(c, pointee.get_result())
             if c.semantic_parent.spelling in config["force_raw_function_pointer"]:
                 return f'extern "C" fn({args})' + (
-                    f" -> {ret_type}" if ret_type != "c_void" else ""
+                    f" -> {ret_type}" if str(ret_type) != "c_void" else ""
                 )
             else:
                 return f'Option<unsafe extern "C" fn({args})' + (
-                    f" -> {ret_type}>" if ret_type != "c_void" else ">"
+                    f" -> {ret_type}>" if str(ret_type) != "c_void" else ">"
                 )
 
         is_mut = not pointee.spelling.startswith("const")