Have UtsName getters return &OsStr

Author: koute

src/features.rs

@@ -3,6 +3,7 @@ pub use self::os::*;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod os {
+    use std::os::unix::ffi::OsStrExt;
     use crate::sys::utsname::uname;
     use crate::Result;
 
@@ -31,7 +32,7 @@ mod os {
         let mut minor: usize = 0;
         let mut patch: usize = 0;
 
-        for &b in u.release() {
+        for &b in u.release().as_bytes() {
             if curr >= 3 {
                 break;
             }

src/sys/utsname.rs

@@ -1,5 +1,7 @@
 //! Get system identification
 use std::mem;
+use std::os::unix::ffi::OsStrExt;
+use std::ffi::OsStr;
 use libc::c_char;
 use crate::{Errno, Result};
 
@@ -10,27 +12,27 @@ pub struct UtsName(libc::utsname);
 
 impl UtsName {
     /// Name of the operating system implementation.
-    pub fn sysname(&self) -> &[u8] {
+    pub fn sysname(&self) -> &OsStr {
         cast_and_trim(&self.0.sysname)
     }
 
     /// Network name of this machine.
-    pub fn nodename(&self) -> &[u8] {
+    pub fn nodename(&self) -> &OsStr {
         cast_and_trim(&self.0.nodename)
     }
 
     /// Release level of the operating system.
-    pub fn release(&self) -> &[u8] {
+    pub fn release(&self) -> &OsStr {
         cast_and_trim(&self.0.release)
     }
 
     /// Version level of the operating system.
-    pub fn version(&self) -> &[u8] {
+    pub fn version(&self) -> &OsStr {
         cast_and_trim(&self.0.version)
     }
 
     /// Machine hardware platform.
-    pub fn machine(&self) -> &[u8] {
+    pub fn machine(&self) -> &OsStr {
         cast_and_trim(&self.0.machine)
     }
 }
@@ -44,30 +46,32 @@ pub fn uname() -> Result<UtsName> {
     }
 }
 
-fn cast_and_trim(slice: &[c_char]) -> &[u8] {
+fn cast_and_trim(slice: &[c_char]) -> &OsStr {
     let length = slice.iter().position(|&byte| byte == 0).unwrap_or(slice.len());
-    unsafe {
+    let bytes = unsafe {
         std::slice::from_raw_parts(slice.as_ptr().cast(), length)
-    }
+    };
+
+    OsStr::from_bytes(bytes)
 }
 
 #[cfg(test)]
 mod test {
     #[cfg(target_os = "linux")]
     #[test]
     pub fn test_uname_linux() {
-        assert_eq!(super::uname().unwrap().sysname(), b"Linux");
+        assert_eq!(super::uname().unwrap().sysname(), "Linux");
     }
 
     #[cfg(any(target_os = "macos", target_os = "ios"))]
     #[test]
     pub fn test_uname_darwin() {
-        assert_eq!(super::uname().unwrap().sysname(), b"Darwin");
+        assert_eq!(super::uname().unwrap().sysname(), "Darwin");
     }
 
     #[cfg(target_os = "freebsd")]
     #[test]
     pub fn test_uname_freebsd() {
-        assert_eq!(super::uname().unwrap().sysname(), b"FreeBSD");
+        assert_eq!(super::uname().unwrap().sysname(), "FreeBSD");
     }
 }

test/common/mod.rs

@@ -112,14 +112,14 @@ cfg_if! {
                         .expect("Bad match_version provided");
 
                 let uname = nix::sys::utsname::uname().unwrap();
-                println!("{}", std::str::from_utf8(uname.sysname()).unwrap());
-                println!("{}", std::str::from_utf8(uname.nodename()).unwrap());
-                println!("{}", std::str::from_utf8(uname.release()).unwrap());
-                println!("{}", std::str::from_utf8(uname.version()).unwrap());
-                println!("{}", std::str::from_utf8(uname.machine()).unwrap());
+                println!("{}", uname.sysname().to_str().unwrap());
+                println!("{}", uname.nodename().to_str().unwrap());
+                println!("{}", uname.release().to_str().unwrap());
+                println!("{}", uname.version().to_str().unwrap());
+                println!("{}", uname.machine().to_str().unwrap());
 
                 // Fix stuff that the semver parser can't handle
-                let fixed_release = &std::str::from_utf8(uname.release()).unwrap().to_string()
+                let fixed_release = &uname.release().to_str().unwrap().to_string()
                     // Fedora 33 reports version as 4.18.el8_2.x86_64 or
                     // 5.18.200-fc33.x86_64.  Remove the underscore.
                     .replace("_", "-")