Merge pull request #26 from jclulow/illumos

add test support for illumos systems

README.md

@@ -7,7 +7,7 @@ terminal-size
 
 Rust library to getting the size of your terminal.
 
-Works on Linux, MacOS, and Windows.
+Works on Linux, MacOS, Windows, and illumos.
 
 ```rust
 use terminal_size::{Width, Height, terminal_size};

src/unix.rs

@@ -48,30 +48,64 @@ fn compare_with_stty() {
     use std::process::Command;
     use std::process::Stdio;
 
-    let output = if cfg!(target_os = "linux") {
-        Command::new("stty")
-            .arg("size")
-            .arg("-F")
-            .arg("/dev/stderr")
-            .stderr(Stdio::inherit())
+    let (rows, cols) = if cfg!(target_os = "illumos") {
+        // illumos stty(1) does not accept a device argument, instead using
+        // stdin unconditionally:
+        let output = Command::new("stty")
+            .stdin(Stdio::inherit())
             .output()
+            .unwrap();
+        assert!(output.status.success());
+
+        // stdout includes the row and columns thus: "rows = 80; columns = 24;"
+        let vals = String::from_utf8(output.stdout)
             .unwrap()
+            .lines()
+            .map(|line| {
+                // Split each line on semicolons to get "k = v" strings:
+                line.split(';')
+                    .map(str::trim)
+                    .map(str::to_string)
+                    .collect::<Vec<_>>()
+            })
+            .flatten()
+            .filter_map(|term| {
+                // split each "k = v" string and look for rows/columns:
+                match term.splitn(2, " = ").collect::<Vec<_>>().as_slice() {
+                    ["rows", n] | ["columns", n] => Some(n.parse().unwrap()),
+                    _ => None,
+                }
+            })
+            .collect::<Vec<_>>();
+        (vals[0], vals[1])
     } else {
-        Command::new("stty")
-            .arg("-f")
-            .arg("/dev/stderr")
-            .arg("size")
-            .stderr(Stdio::inherit())
-            .output()
-            .unwrap()
+        let output = if cfg!(target_os = "linux") {
+            Command::new("stty")
+                .arg("size")
+                .arg("-F")
+                .arg("/dev/stderr")
+                .stderr(Stdio::inherit())
+                .output()
+                .unwrap()
+        } else {
+            Command::new("stty")
+                .arg("-f")
+                .arg("/dev/stderr")
+                .arg("size")
+                .stderr(Stdio::inherit())
+                .output()
+                .unwrap()
+        };
+
+        assert!(output.status.success());
+        let stdout = String::from_utf8(output.stdout).unwrap();
+        // stdout is "rows cols"
+        let mut data = stdout.split_whitespace();
+        println!("{}", stdout);
+        let rows = u16::from_str_radix(data.next().unwrap(), 10).unwrap();
+        let cols = u16::from_str_radix(data.next().unwrap(), 10).unwrap();
+        (rows, cols)
     };
-    let stdout = String::from_utf8(output.stdout).unwrap();
-    assert!(output.status.success());
-    // stdout is "rows cols"
-    let mut data = stdout.split_whitespace();
-    let rows = u16::from_str_radix(data.next().unwrap(), 10).unwrap();
-    let cols = u16::from_str_radix(data.next().unwrap(), 10).unwrap();
-    println!("{}", stdout);
     println!("{} {}", rows, cols);
 
     if let Some((Width(w), Height(h))) = terminal_size() {