Add a --run-args argument

Author: phil-opp

src/args.rs

@@ -220,6 +220,7 @@ where
     .canonicalize()
     .map_err(|err| format!("Failed to canonicalize executable path: {}", err))?;
     let mut run_command = None;
+    let mut run_args = None;
 
     loop {
         match arg_iter.next().as_ref().map(|s| s.as_str()) {
@@ -230,6 +231,13 @@ where
                 }
                 break;
             }
+            Some("--args") => {
+                let old = mem::replace(&mut run_args, Some(arg_iter.collect()));
+                if !old.is_none() {
+                    Err("multiple `--args` arguments")?;
+                }
+                break;
+            }
             Some("--help") | Some("-h") => {
                 return Ok(Command::RunnerHelp);
             }
@@ -244,13 +252,15 @@ where
     Ok(Command::Runner(RunnerArgs {
         executable,
         run_command,
+        run_args: run_args,
     }))
 }
 
 #[derive(Debug, Clone)]
 pub struct RunnerArgs {
     pub executable: PathBuf,
     pub run_command: Option<Vec<String>>,
+    pub run_args: Option<Vec<String>>,
 }
 
 #[derive(Debug, Clone)]

src/subcommand/runner.rs

@@ -20,6 +20,9 @@ pub(crate) fn runner(args: RunnerArgs) -> Result<(), ErrorString> {
     for arg in &run_cmd[1..] {
         command.arg(arg.replace("{bootimage}", &format!("{}", bootimage_bin.display())));
     }
+    if let Some(run_args) = args.run_args {
+        command.args(run_args);
+    }
     let output = command
         .output()
         .map_err(|e| format!("Failed to execute `{:?}`: {}", command, e))?;