stty: Fix stty panic for standard bauds

Author: oech3

Cargo.lock

@@ -138,7 +138,6 @@ impl FileInformation {
             any(
                 target_vendor = "apple",
                 target_os = "android",
-                target_os = "freebsd",
                 target_os = "netbsd",
                 target_os = "openbsd",
                 target_os = "illumos",
@@ -152,6 +151,8 @@ impl FileInformation {
             )
         ))]
         return self.0.st_nlink.into();
+        #[cfg(target_os = "freebsd")]
+        return self.0.st_nlink;
         #[cfg(target_os = "aix")]
         return self.0.st_nlink.try_into().unwrap();
         #[cfg(windows)]
@@ -160,16 +161,9 @@ impl FileInformation {
 
     #[cfg(unix)]
     pub fn inode(&self) -> u64 {
-        #[cfg(all(
-            not(any(target_os = "freebsd", target_os = "netbsd")),
-            target_pointer_width = "64"
-        ))]
+        #[cfg(all(not(any(target_os = "netbsd")), target_pointer_width = "64"))]
         return self.0.st_ino;
-        #[cfg(any(
-            target_os = "freebsd",
-            target_os = "netbsd",
-            not(target_pointer_width = "64")
-        ))]
+        #[cfg(any(target_os = "netbsd", not(target_pointer_width = "64")))]
         return self.0.st_ino.into();
     }
 }

src/uucore/src/lib/features/fs.rs

@@ -446,11 +446,8 @@ unsafe extern "C" {
     #[link_name = "getmntinfo"]
     fn get_mount_info(mount_buffer_p: *mut *mut StatFs, flags: c_int) -> c_int;
 
-    // Rust on FreeBSD uses 11.x ABI for filesystem metadata syscalls.
-    // Call the right version of the symbol for getmntinfo() result to
-    // match libc StatFS layout.
     #[cfg(target_os = "freebsd")]
-    #[link_name = "getmntinfo@FBSD_1.0"]
+    #[link_name = "getmntinfo"]
     fn get_mount_info(mount_buffer_p: *mut *mut StatFs, flags: c_int) -> c_int;
 }
 

src/uucore/src/lib/features/fsext.rs

@@ -9,7 +9,7 @@
 // Only available on Linux
 //
 // spell-checker:ignore CLOEXEC RDONLY TOCTOU closedir dirp fdopendir fstatat openat REMOVEDIR unlinkat smallfile
-// spell-checker:ignore RAII dirfd fchownat fchown FchmodatFlags fchmodat fchmod
+// spell-checker:ignore RAII dirfd fchownat fchown FchmodatFlags fchmodat fchmod atim mtim ctim
 
 #[cfg(test)]
 use std::os::unix::ffi::OsStringExt;
@@ -471,7 +471,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn atime(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_atime.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_atim.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_atime.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {
@@ -482,7 +490,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn atime_nsec(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_atime_nsec.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_atim_nsec.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_atime_nsec.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {
@@ -493,7 +509,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn mtime(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_mtime.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_mtim.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_mtime.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {
@@ -504,7 +528,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn mtime_nsec(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_mtime_nsec.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_mtim_nsec.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_mtime_nsec.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {
@@ -515,7 +547,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn ctime(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_ctime.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_ctim.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_ctime.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {
@@ -526,7 +566,15 @@ impl std::os::unix::fs::MetadataExt for Metadata {
     fn ctime_nsec(&self) -> i64 {
         #[cfg(target_pointer_width = "32")]
         {
-            self.stat.st_ctime_nsec.into()
+            #[cfg(target_env = "musl", target_arch = "x86")]
+            {
+                self.stat.st_ctim_nsec.into()
+            }
+
+            #[cfg(not(target_env = "musl", target_arch = "x86"))]
+            {
+                self.stat.st_ctime_nsec.into()
+            }
         }
         #[cfg(not(target_pointer_width = "32"))]
         {