Merge pull request #28 from poliorcetics/fix-len-crash

Ensures '--len' does not crash or hang

1 files changed, 8 insertions, 14 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 8d7e594..48af7b6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -250,7 +250,7 @@ pub fn run(matches: ArgMatches) -> Result<(), Box<dyn Error>> {
         }
 
         if let Some(length) = matches.value_of(ARG_LEN) {
-            truncate_len = length.parse::<u64>().unwrap();
+            truncate_len = length.parse::<u64>()?;
         }
 
         if let Some(format) = matches.value_of(ARG_FMT) {
@@ -341,24 +341,18 @@ pub fn is_stdin(matches: ArgMatches) -> Result<bool, Box<dyn Error>> {
         dbg!(env::args().len(), matches.args.len());
         dbg!(env::args().nth(0).unwrap());
     }
-    if let Some(nth1) = env::args().nth(1) {
+    if let Some(file) = matches.value_of(ARG_INP) {
         if DBG > 0 {
-            dbg!(nth1);
+            dbg!(file);
         }
-        for arg in ARGS.iter() {
-            if let Some(index) = matches.index_of(arg) {
-                if let 2 = index {
-                    is_stdin = true;
-                }
-            }
+        is_stdin = false;
+    } else if let Some(nth1) = env::args().nth(1) {
+        if DBG > 0 {
+            dbg!(nth1);
         }
+        is_stdin = ARGS.iter().any(|arg| matches.index_of(arg) == Some(2));
     } else if matches.args.is_empty() {
         is_stdin = true;
-    } else if let Some(file) = matches.value_of(ARG_INP) {
-        if DBG > 0 {
-            dbg!(file);
-        }
-        is_stdin = false;
     }
     if DBG > 0 {
         dbg!(is_stdin);