# This is a combination of 4 commits.

lvllvl · lvllvl · commit 895a682a756d · 2025-01-09T01:15:44.000Z
# This is the 1st commit message: chore: add labels to FIXMEs # This is the commit message #2: chore: add labels to FIXMEs # This is the commit message #3: Declare `setdomainname` and `getdomainname` on Android. Android [supports] `setdomainname` and `getdomainname` in API level 26. [supports] https://github.com/aosp-google/bionic/blob/28f9101d76b709febe25977f98530d77580387d1/libc/include/unistd.h#L236 # This is the commit message #4: Move `setdomainname` and `getdomainname` into linux_like.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -2081,6 +2081,9 @@ fn test_android(target: &str) {
             // Added in API level 26, but some tests use level 24.
             "endgrent" => true,
 
+            // Added in API level 26, but some tests use level 24.
+            "getdomainname" | "setdomainname" => true,
+
             // FIXME: bad function pointers:
             "isalnum" | "isalpha" | "iscntrl" | "isdigit" | "isgraph" | "islower" | "isprint"
             | "ispunct" | "isspace" | "isupper" | "isxdigit" | "isblank" | "tolower"
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -3324,6 +3324,7 @@ getaddrinfo
 getchar
 getchar_unlocked
 getcwd
+getdomainname
 getegid
 getenv
 geteuid
@@ -3720,6 +3721,7 @@ sendmsg
 sendto
 servent
 setbuf
+setdomainname
 setegid
 setenv
 seteuid
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -185,7 +185,7 @@ cfg_if! {
                 f.debug_struct("sockaddr_un")
                     .field("sun_len", &self.sun_len)
                     .field("sun_family", &self.sun_family)
-                    // FIXME: .field("sun_path", &self.sun_path)
+                    // FIXME(debug): .field("sun_path", &self.sun_path)
                     .finish()
             }
         }
@@ -232,11 +232,11 @@ cfg_if! {
         impl fmt::Debug for utsname {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("utsname")
-                    // FIXME: .field("sysname", &self.sysname)
-                    // FIXME: .field("nodename", &self.nodename)
-                    // FIXME: .field("release", &self.release)
-                    // FIXME: .field("version", &self.version)
-                    // FIXME: .field("machine", &self.machine)
+                    // FIXME(debug): .field("sysname", &self.sysname)
+                    // FIXME(debug): .field("nodename", &self.nodename)
+                    // FIXME(debug): .field("release", &self.release)
+                    // FIXME(debug): .field("version", &self.version)
+                    // FIXME(debug): .field("machine", &self.machine)
                     .finish()
             }
         }
diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -780,7 +780,7 @@ cfg_if! {
                     .field("d_reclen", &self.d_reclen)
                     .field("d_type", &self.d_type)
                     .field("d_namlen", &self.d_namlen)
-                    // FIXME: .field("d_name", &self.d_name)
+                    // FIXME(debug): .field("d_name", &self.d_name)
                     .finish()
             }
         }
@@ -873,8 +873,8 @@ cfg_if! {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("lastlog")
                     .field("ll_time", &self.ll_time)
-                    // FIXME: .field("ll_line", &self.ll_line)
-                    // FIXME: .field("ll_host", &self.ll_host)
+                    // FIXME(debug): .field("ll_line", &self.ll_line)
+                    // FIXME(debug): .field("ll_host", &self.ll_host)
                     .finish()
             }
         }
@@ -913,9 +913,9 @@ cfg_if! {
         impl fmt::Debug for utmp {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("utmp")
-                    // FIXME: .field("ut_line", &self.ut_line)
-                    // FIXME: .field("ut_name", &self.ut_name)
-                    // FIXME: .field("ut_host", &self.ut_host)
+                    // FIXME(debug): .field("ut_line", &self.ut_line)
+                    // FIXME(debug): .field("ut_name", &self.ut_name)
+                    // FIXME(debug): .field("ut_host", &self.ut_host)
                     .field("ut_time", &self.ut_time)
                     .finish()
             }
@@ -1048,10 +1048,10 @@ cfg_if! {
                     .field("f_namemax", &self.f_namemax)
                     .field("f_owner", &self.f_owner)
                     .field("f_ctime", &self.f_ctime)
-                    // FIXME: .field("f_fstypename", &self.f_fstypename)
-                    // FIXME: .field("f_mntonname", &self.f_mntonname)
-                    // FIXME: .field("f_mntfromname", &self.f_mntfromname)
-                    // FIXME: .field("f_mntfromspec", &self.f_mntfromspec)
+                    // FIXME(debug): .field("f_fstypename", &self.f_fstypename)
+                    // FIXME(debug): .field("f_mntonname", &self.f_mntonname)
+                    // FIXME(debug): .field("f_mntfromname", &self.f_mntfromname)
+                    // FIXME(debug): .field("f_mntfromspec", &self.f_mntfromspec)
                     .field("mount_info", &self.mount_info)
                     .finish()
             }
diff --git a/src/unix/bsd/netbsdlike/openbsd/x86_64.rs b/src/unix/bsd/netbsdlike/openbsd/x86_64.rs
@@ -94,8 +94,8 @@ cfg_if! {
                     .field("fx_rdp", &{ self.fx_rdp })
                     .field("fx_mxcsr", &{ self.fx_mxcsr })
                     .field("fx_mxcsr_mask", &{ self.fx_mxcsr_mask })
-                    // FIXME: .field("fx_st", &{self.fx_st})
-                    // FIXME: .field("fx_xmm", &{self.fx_xmm})
+                    // FIXME(debug): .field("fx_st", &{self.fx_st})
+                    // FIXME(debug): .field("fx_xmm", &{self.fx_xmm})
                     .finish()
             }
         }
diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
@@ -562,7 +562,7 @@ cfg_if! {
                 f.debug_struct("sockaddr_un")
                     .field("sun_len", &self.sun_len)
                     .field("sun_family", &self.sun_family)
-                    // FIXME: .field("sun_path", &self.sun_path)
+                    // FIXME(debug): .field("sun_path", &self.sun_path)
                     .finish()
             }
         }
@@ -599,7 +599,7 @@ cfg_if! {
                     .field("ss_family", &self.ss_family)
                     .field("__ss_pad1", &self.__ss_pad1)
                     .field("__ss_pad2", &self.__ss_pad2)
-                    // FIXME: .field("__ss_pad3", &self.__ss_pad3)
+                    // FIXME(debug): .field("__ss_pad3", &self.__ss_pad3)
                     .finish()
             }
         }
@@ -636,7 +636,7 @@ cfg_if! {
                     .field("d_ino", &self.d_ino)
                     .field("d_pino", &self.d_pino)
                     .field("d_reclen", &self.d_reclen)
-                    // FIXME: .field("d_name", &self.d_name)
+                    // FIXME(debug): .field("d_name", &self.d_name)
                     .finish()
             }
         }
@@ -868,7 +868,7 @@ pub const LC_NUMERIC: c_int = 4;
 pub const LC_TIME: c_int = 5;
 pub const LC_MESSAGES: c_int = 6;
 
-// FIXME: Haiku does not have MAP_FILE, but library/std/os.rs requires it
+// FIXME(haiku): Haiku does not have MAP_FILE, but library/std/os.rs requires it
 pub const MAP_FILE: c_int = 0x00;
 pub const MAP_SHARED: c_int = 0x01;
 pub const MAP_PRIVATE: c_int = 0x02;
@@ -1301,7 +1301,7 @@ pub const PTHREAD_MUTEX_NORMAL: c_int = 1;
 pub const PTHREAD_MUTEX_ERRORCHECK: c_int = 2;
 pub const PTHREAD_MUTEX_RECURSIVE: c_int = 3;
 
-pub const FIOCLEX: c_ulong = 0; // FIXME: does not exist on Haiku!
+pub const FIOCLEX: c_ulong = 0; // FIXME(haiku): does not exist on Haiku!
 
 pub const RUSAGE_CHILDREN: c_int = -1;
 
diff --git a/src/unix/haiku/x86_64.rs b/src/unix/haiku/x86_64.rs
@@ -94,9 +94,9 @@ cfg_if! {
                     .field("rdp", &self.rdp)
                     .field("mxcsr", &self.mxcsr)
                     .field("mscsr_mask", &self.mscsr_mask)
-                    // FIXME: .field("_fpreg", &self._fpreg)
-                    // FIXME: .field("_xmm", &self._xmm)
-                    // FIXME: .field("_reserved_416_511", &self._reserved_416_511)
+                    // FIXME(debug): .field("_fpreg", &self._fpreg)
+                    // FIXME(debug): .field("_xmm", &self._xmm)
+                    // FIXME(debug): .field("_reserved_416_511", &self._reserved_416_511)
                     .finish()
             }
         }
@@ -133,7 +133,7 @@ cfg_if! {
                 f.debug_struct("xstate_hdr")
                     .field("bv", &self.bv)
                     .field("xcomp_bv", &self.xcomp_bv)
-                    // FIXME: .field("_reserved", &field._reserved)
+                    // FIXME(debug): .field("_reserved", &field._reserved)
                     .finish()
             }
         }
@@ -162,7 +162,7 @@ cfg_if! {
                 f.debug_struct("savefpu")
                     .field("fp_fxsave", &self.fp_fxsave)
                     .field("fp_xstate", &self.fp_xstate)
-                    // FIXME: .field("_fp_ymm", &field._fp_ymm)
+                    // FIXME(debug): .field("_fp_ymm", &field._fp_ymm)
                     .finish()
             }
         }
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
@@ -1576,8 +1576,6 @@ extern "C" {
     pub fn mkstemps(template: *mut c_char, suffixlen: c_int) -> c_int;
     pub fn nl_langinfo(item: crate::nl_item) -> *mut c_char;
 
-    pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;
-    pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;
     pub fn sendmmsg(
         sockfd: c_int,
         msgvec: *mut crate::mmsghdr,
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -5307,6 +5307,7 @@ pub const CANFD_MAX_DLEN: usize = 64;
 
 pub const CANFD_BRS: c_int = 0x01;
 pub const CANFD_ESI: c_int = 0x02;
+pub const CANFD_FDF: c_int = 0x04;
 
 pub const CANXL_MIN_DLC: c_int = 0;
 pub const CANXL_MAX_DLC: c_int = 2047;
@@ -6428,8 +6429,6 @@ extern "C" {
 
     pub fn nl_langinfo(item: crate::nl_item) -> *mut c_char;
 
-    pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;
-    pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;
     pub fn vhangup() -> c_int;
     pub fn sync();
     pub fn syncfs(fd: c_int) -> c_int;
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -1863,6 +1863,9 @@ extern "C" {
         locale: crate::locale_t,
     ) -> size_t;
     pub fn strptime(s: *const c_char, format: *const c_char, tm: *mut crate::tm) -> *mut c_char;
+
+    pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;
+    pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;
 }
 
 // LFS64 extensions
diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs
@@ -806,7 +806,7 @@ cfg_if! {
                 f.debug_struct("sockaddr_un")
                     .field("sun_len", &self.sun_len)
                     .field("sun_family", &self.sun_family)
-                    // FIXME: .field("sun_path", &self.sun_path)
+                    // FIXME(debug): .field("sun_path", &self.sun_path)
                     .finish()
             }
         }
@@ -1015,11 +1015,11 @@ cfg_if! {
         impl fmt::Debug for utsname {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("utsname")
-                    // FIXME: .field("sysname", &self.sysname)
-                    // FIXME: .field("nodename", &self.nodename)
-                    // FIXME: .field("release", &self.release)
-                    // FIXME: .field("version", &self.version)
-                    // FIXME: .field("machine", &self.machine)
+                    // FIXME(debug): .field("sysname", &self.sysname)
+                    // FIXME(debug): .field("nodename", &self.nodename)
+                    // FIXME(debug): .field("release", &self.release)
+                    // FIXME(debug): .field("version", &self.version)
+                    // FIXME(debug): .field("machine", &self.machine)
                     .finish()
             }
         }
@@ -1095,7 +1095,7 @@ cfg_if! {
                     .field("ss_family", &self.ss_family)
                     .field("__ss_pad1", &self.__ss_pad1)
                     .field("__ss_align", &self.__ss_align)
-                    // FIXME: .field("__ss_pad2", &self.__ss_pad2)
+                    // FIXME(debug): .field("__ss_pad2", &self.__ss_pad2)
                     .finish()
             }
         }
diff --git a/src/unix/nuttx/mod.rs b/src/unix/nuttx/mod.rs
@@ -54,6 +54,7 @@ s! {
 
     pub struct passwd {
         pub pw_name: *const c_char,
+        pub pw_passwd: *const c_char,
         pub pw_uid: u32,
         pub pw_gid: u32,
         pub pw_gecos: *const c_char,
@@ -128,7 +129,7 @@ s! {
         pub tm_yday: i32,
         pub tm_isdst: i32,
         pub tm_gmtoff: isize,
-        pub tm_zone: *const i8,
+        pub tm_zone: *const c_char,
         __reserved: [usize; __DEFAULT_RESERVED_SIZE__],
     }
 
@@ -165,7 +166,7 @@ s! {
 
     pub struct dirent {
         pub d_type: u8,
-        pub d_name: [i8; __NAME_MAX__ + 1],
+        pub d_name: [c_char; __NAME_MAX__ + 1],
     }
 
     pub struct fd_set {
@@ -247,6 +248,7 @@ s! {
 // for example, struct passwd, https://pubs.opengroup.org/onlinepubs/009695399/basedefs/pwd.h.html,
 // POSIX only defines following fields in struct passwd:
 // char    *pw_name   User's login name.
+// char    *pw_passwd Encrypted password.
 // uid_t    pw_uid    Numerical user ID.
 // gid_t    pw_gid    Numerical group ID.
 // char    *pw_dir    Initial working directory.
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
diff --git a/triagebot.toml b/triagebot.toml

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ cfg_if! {`
`94`	`94`	`.field("fx_rdp", &{ self.fx_rdp })`
`95`	`95`	`.field("fx_mxcsr", &{ self.fx_mxcsr })`
`96`	`96`	`.field("fx_mxcsr_mask", &{ self.fx_mxcsr_mask })`
`97`		`- // FIXME: .field("fx_st", &{self.fx_st})`
`98`		`- // FIXME: .field("fx_xmm", &{self.fx_xmm})`
	`97`	`+ // FIXME(debug): .field("fx_st", &{self.fx_st})`
	`98`	`+ // FIXME(debug): .field("fx_xmm", &{self.fx_xmm})`
`99`	`99`	`.finish()`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ cfg_if! {`
`94`	`94`	`.field("rdp", &self.rdp)`
`95`	`95`	`.field("mxcsr", &self.mxcsr)`
`96`	`96`	`.field("mscsr_mask", &self.mscsr_mask)`
`97`		`- // FIXME: .field("_fpreg", &self._fpreg)`
`98`		`- // FIXME: .field("_xmm", &self._xmm)`
`99`		`- // FIXME: .field("_reserved_416_511", &self._reserved_416_511)`
	`97`	`+ // FIXME(debug): .field("_fpreg", &self._fpreg)`
	`98`	`+ // FIXME(debug): .field("_xmm", &self._xmm)`
	`99`	`+ // FIXME(debug): .field("_reserved_416_511", &self._reserved_416_511)`
`100`	`100`	`.finish()`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -133,7 +133,7 @@ cfg_if! {`
`133`	`133`	`f.debug_struct("xstate_hdr")`
`134`	`134`	`.field("bv", &self.bv)`
`135`	`135`	`.field("xcomp_bv", &self.xcomp_bv)`
`136`		`- // FIXME: .field("_reserved", &field._reserved)`
	`136`	`+ // FIXME(debug): .field("_reserved", &field._reserved)`
`137`	`137`	`.finish()`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -162,7 +162,7 @@ cfg_if! {`
`162`	`162`	`f.debug_struct("savefpu")`
`163`	`163`	`.field("fp_fxsave", &self.fp_fxsave)`
`164`	`164`	`.field("fp_xstate", &self.fp_xstate)`
`165`		`- // FIXME: .field("_fp_ymm", &field._fp_ymm)`
	`165`	`+ // FIXME(debug): .field("_fp_ymm", &field._fp_ymm)`
`166`	`166`	`.finish()`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1863,6 +1863,9 @@ extern "C" {`
`1863`	`1863`	`locale: crate::locale_t,`
`1864`	`1864`	`) -> size_t;`
`1865`	`1865`	`pub fn strptime(s: const c_char, format: const c_char, tm: mut crate::tm) -> mut c_char;`
	`1866`	`+`
	`1867`	`+ pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;`
	`1868`	`+ pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;`
`1866`	`1869`	`}`
`1867`	`1870`
`1868`	`1871`	`// LFS64 extensions`
Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ cfg_if! {`
`806`	`806`	`f.debug_struct("sockaddr_un")`
`807`	`807`	`.field("sun_len", &self.sun_len)`
`808`	`808`	`.field("sun_family", &self.sun_family)`
`809`		`- // FIXME: .field("sun_path", &self.sun_path)`
	`809`	`+ // FIXME(debug): .field("sun_path", &self.sun_path)`
`810`	`810`	`.finish()`
`811`	`811`	`}`
`812`	`812`	`}`
`@@ -1015,11 +1015,11 @@ cfg_if! {`
`1015`	`1015`	`impl fmt::Debug for utsname {`
`1016`	`1016`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`1017`	`1017`	`f.debug_struct("utsname")`
`1018`		`- // FIXME: .field("sysname", &self.sysname)`
`1019`		`- // FIXME: .field("nodename", &self.nodename)`
`1020`		`- // FIXME: .field("release", &self.release)`
`1021`		`- // FIXME: .field("version", &self.version)`
`1022`		`- // FIXME: .field("machine", &self.machine)`
	`1018`	`+ // FIXME(debug): .field("sysname", &self.sysname)`
	`1019`	`+ // FIXME(debug): .field("nodename", &self.nodename)`
	`1020`	`+ // FIXME(debug): .field("release", &self.release)`
	`1021`	`+ // FIXME(debug): .field("version", &self.version)`
	`1022`	`+ // FIXME(debug): .field("machine", &self.machine)`
`1023`	`1023`	`.finish()`
`1024`	`1024`	`}`
`1025`	`1025`	`}`
`@@ -1095,7 +1095,7 @@ cfg_if! {`
`1095`	`1095`	`.field("ss_family", &self.ss_family)`
`1096`	`1096`	`.field("__ss_pad1", &self.__ss_pad1)`
`1097`	`1097`	`.field("__ss_align", &self.__ss_align)`
`1098`		`- // FIXME: .field("__ss_pad2", &self.__ss_pad2)`
	`1098`	`+ // FIXME(debug): .field("__ss_pad2", &self.__ss_pad2)`
`1099`	`1099`	`.finish()`
`1100`	`1100`	`}`
`1101`	`1101`	`}`