fix '--' parameter handling and help error output

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/main.rs b/src/main.rs
index 8aaa85fe31c06f8bdee49c5429da5d1cf657ca13..3e2dc00bf5d8336fa8ce786696c649d76534ef61 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -55,6 +55,17 @@ fn main() {
     let mut use_sd_notify = false;
     let mut path = None;
 
+    let mut nonopt_arg = |arg: OsString| {
+        if path.is_some() {
+            let _ = stderr().write_all(b"unexpected extra parameter: ");
+            let _ = stderr().write_all(arg.as_bytes());
+            let _ = stderr().write_all(b"\n");
+            usage(1, &program, &mut stderr());
+        }
+
+        path = Some(arg);
+    };
+
     for arg in &mut args {
         if arg == "-h" || arg == "--help" {
             usage(0, &program, &mut stdout());
@@ -65,23 +76,22 @@ fn main() {
         } else if arg == "--system" {
             use_sd_notify = true;
         } else {
-            let bytes = arg.as_bytes();
-            if bytes.starts_with(b"-") {
+            if arg.as_bytes().starts_with(b"-") {
                 let _ = stderr().write_all(b"unexpected option: ");
                 let _ = stderr().write_all(arg.as_bytes());
+                let _ = stderr().write_all(b"\n");
                 usage(1, &program, &mut stderr());
             }
 
-            if path.is_some() {
-                let _ = stderr().write_all(b"unexpected extra parameter: ");
-                let _ = stderr().write_all(arg.as_bytes());
-                usage(1, &program, &mut stderr());
-            }
-
-            path = Some(arg);
+            nonopt_arg(arg);
         }
     }
 
+    for arg in &mut args {
+        nonopt_arg(arg);
+    }
+    drop(nonopt_arg);
+
     let path = match path {
         Some(path) => path,
         None => {