Initial implementation of Illumos support

README.md

@@ -90,6 +90,7 @@ Right now, the following operating system types can be returned:
 - Fedora
 - FreeBSD
 - HardenedBSD
+- Illumos
 - Linux
 - Linux Mint
 - macOS (Mac OS X or OS X)

cspell-dictionary.txt

@@ -9,6 +9,8 @@ endeavouros
 freebsd
 hardenedbsd
 hbsd
+illumos
+isainfo
 libntdll
 linuxmint
 macos

os_info/src/bitness.rs

@@ -4,6 +4,7 @@ use std::fmt::{self, Display, Formatter};
 #[cfg(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "illumos",
     target_os = "linux",
     target_os = "macos",
     target_os = "netbsd",
@@ -78,6 +79,15 @@ pub fn get() -> Bitness {
     }
 }
 
+#[cfg(target_os = "illumos")]
+pub fn get() -> Bitness {
+    match &Command::new("isainfo").arg("-b").output() {
+        Ok(Output { stdout, .. }) if stdout == b"64\n" => Bitness::X64,
+        Ok(Output { stdout, .. }) if stdout == b"32\n" => Bitness::X32,
+        _ => Bitness::Unknown,
+    }
+}
+
 #[cfg(all(
     test,
     any(

os_info/src/illumos/mod.rs

@@ -0,0 +1,67 @@
+use std::process::Command;
+use std::str;
+
+use log::{error, trace};
+
+use crate::{bitness, uname::uname, Info, Type, Version};
+
+pub fn current_platform() -> Info {
+    trace!("illumos::current_platform is called");
+
+    let version = get_version()
+        .map(Version::from_string)
+        .unwrap_or_else(|| Version::Unknown);
+
+    let info = Info {
+        os_type: get_os(),
+        version,
+        bitness: bitness::get(),
+        ..Default::default()
+    };
+
+    trace!("Returning {:?}", info);
+    info
+}
+
+fn get_version() -> Option<String> {
+    Command::new("uname")
+        .arg("-v")
+        .output()
+        .map_err(|e| {
+            error!("Failed to invoke 'uname': {:?}", e);
+        })
+        .ok()
+        .and_then(|out| {
+            if out.status.success() {
+                Some(String::from_utf8_lossy(&out.stdout).trim_end().to_owned())
+            } else {
+                log::error!("'uname' invocation error: {:?}", out);
+                None
+            }
+        })
+}
+
+fn get_os() -> Type {
+    let os = Command::new("uname")
+        .arg("-o")
+        .output()
+        .expect("Failed to get OS");
+
+    match str::from_utf8(&os.stdout) {
+        Ok("illumos\n") => Type::Illumos,
+        Ok(_) => Type::Unknown,
+        Err(_) => Type::Unknown,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn os_type() {
+        let version = current_platform();
+        assert_eq!(Type::Illumos, version.os_type());
+    }
+}

os_info/src/lib.rs

@@ -26,6 +26,10 @@ mod imp;
 #[path = "freebsd/mod.rs"]
 mod imp;
 
+#[cfg(target_os = "illumos")]
+#[path = "illumos/mod.rs"]
+mod imp;
+
 #[cfg(target_os = "linux")]
 #[path = "linux/mod.rs"]
 mod imp;
@@ -55,6 +59,7 @@ mod imp;
     target_os = "dragonfly",
     target_os = "emscripten",
     target_os = "freebsd",
+    target_os = "illumos",
     target_os = "linux",
     target_os = "macos",
     target_os = "netbsd",
@@ -73,6 +78,7 @@ mod os_type;
 #[cfg(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "illumos",
     target_os = "netbsd",
     target_os = "openbsd"
 ))]

os_info/src/os_type.rs

@@ -31,6 +31,8 @@ pub enum Type {
     /// Linux based operating system (<https://en.wikipedia.org/wiki/Linux>).
     HardenedBSD,
     /// HardenedBSD (https://hardenedbsd.org/)
+    Illumos,
+    /// Illumos (https://en.wikipedia.org/wiki/Illumos)
     Linux,
     /// Mac OS X/OS X/macOS (<https://en.wikipedia.org/wiki/MacOS>).
     Macos,
@@ -87,6 +89,7 @@ impl Display for Type {
             Type::Amazon => write!(f, "Amazon Linux AMI"),
             Type::Arch => write!(f, "Arch Linux"),
             Type::DragonFly => write!(f, "DragonFly BSD"),
+            Type::Illumos => write!(f, "illumos"),
             Type::Macos => write!(f, "Mac OS"),
             Type::MidnightBSD => write!(f, "Midnight BSD"),
             Type::Mint => write!(f, "Linux Mint"),