Fix misc issues on BSD (#79)

Fix misc issues on BSD
rsfetch · Jan 27, 2020 · 2bd3ef9 · 2bd3ef9
2 parents 154b65a + b656e21
commit 2bd3ef9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/memory.rs b/src/memory.rs
@@ -74,12 +74,15 @@ impl RAMInfo {
             self.used  = Some(used  / 1024_f64 / 1024_f64);
             self.total = Some(total / 1024_f64 / 1024_f64);
             return Ok(());
-        } else if os == &OS::FreeBSD || os == &OS::Other {
+        } else if os == &OS::FreeBSD || os == &OS::DragonflyBSD {
             let mut buffer = String::new();
             Command::new("sysctl").arg("-n").arg("hw.physmem")
                 .output().context(RAMErr)?.stdout.iter()
                 .for_each(|b| buffer.push(*b as char));
-            total = buffer.parse::<f64>().unwrap();
+
+            // remove non-integer chars from buffer
+            buffer = buffer.trim().replace("\n", "");
+            total = buffer.parse::<u64>().unwrap() as f64;
 
             let pagesize: f64;
             let inactive: f64;

diff --git a/src/util.rs b/src/util.rs
@@ -8,6 +8,7 @@ pub enum OS {
     FreeBSD,
     OpenBSD,
     NetBSD,
+    DragonflyBSD,
     Other
 }
 
@@ -23,11 +24,12 @@ impl OSInfo {
             .output()?.stdout.iter()
             .for_each(|b| uname.push(*b as char));
         let os = match uname.replace("\n", "").trim().as_ref() {
-            "Linux"   => OS::Linux,
-            "FreeBSD" => OS::FreeBSD,
-            "NetBSD"  => OS::NetBSD,
-            "OpenBSD" => OS::OpenBSD,
-            &_        => OS::Other,
+            "Linux"     => OS::Linux,
+            "FreeBSD"   => OS::FreeBSD,
+            "NetBSD"    => OS::NetBSD,
+            "OpenBSD"   => OS::OpenBSD,
+            "DragonFly" => OS::DragonflyBSD,
+            &_          => OS::Other,
         };
 
         Ok(os)