From c5d7cbda32f443964559c3e66f1c3360b561af4c Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Thu, 10 Jun 2021 16:59:06 +0200
Subject: [PATCH] timeout: handle arguments for the command to run

To prevent clap from parsing flags for the command to run as flags for
timeout, remove the "args" positional argument, but allow to pass flags
via the "command" positional arg.
---
 src/uu/timeout/src/timeout.rs | 28 ++++++++++------------------
 tests/by-util/test_timeout.rs |  8 ++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
index afe560ee5..ea9a0dc65 100644
--- a/src/uu/timeout/src/timeout.rs
+++ b/src/uu/timeout/src/timeout.rs
@@ -37,7 +37,6 @@ pub mod options {
     // Positional args.
     pub static DURATION: &str = "duration";
     pub static COMMAND: &str = "command";
-    pub static ARGS: &str = "args";
 }
 
 struct Config {
@@ -47,8 +46,7 @@ struct Config {
     duration: Duration,
     preserve_status: bool,
 
-    command: String,
-    command_args: Vec<String>,
+    command: Vec<String>,
 }
 
 impl Config {
@@ -77,12 +75,11 @@ impl Config {
         let preserve_status: bool = options.is_present(options::PRESERVE_STATUS);
         let foreground = options.is_present(options::FOREGROUND);
 
-        let command: String = options.value_of(options::COMMAND).unwrap().to_string();
-
-        let command_args: Vec<String> = match options.values_of(options::ARGS) {
-            Some(values) => values.map(|x| x.to_owned()).collect(),
-            None => vec![],
-        };
+        let command = options
+            .values_of(options::COMMAND)
+            .unwrap()
+            .map(String::from)
+            .collect::<Vec<_>>();
 
         Config {
             foreground,
@@ -91,7 +88,6 @@ impl Config {
             duration,
             preserve_status,
             command,
-            command_args,
         }
     }
 }
@@ -137,9 +133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             Arg::with_name(options::COMMAND)
                 .index(2)
                 .required(true)
-        )
-        .arg(
-            Arg::with_name(options::ARGS).multiple(true)
+                .multiple(true)
         )
         .setting(AppSettings::TrailingVarArg);
 
@@ -148,7 +142,6 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let config = Config::from(matches);
     timeout(
         &config.command,
-        &config.command_args,
         config.duration,
         config.signal,
         config.kill_after,
@@ -160,8 +153,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 /// TODO: Improve exit codes, and make them consistent with the GNU Coreutils exit codes.
 
 fn timeout(
-    cmdname: &str,
-    args: &[String],
+    cmd: &[String],
     duration: Duration,
     signal: usize,
     kill_after: Duration,
@@ -171,8 +163,8 @@ fn timeout(
     if !foreground {
         unsafe { libc::setpgid(0, 0) };
     }
-    let mut process = match Command::new(cmdname)
-        .args(args)
+    let mut process = match Command::new(&cmd[0])
+        .args(&cmd[1..])
         .stdin(Stdio::inherit())
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit())
diff --git a/tests/by-util/test_timeout.rs b/tests/by-util/test_timeout.rs
index 28273e00f..2346a17aa 100644
--- a/tests/by-util/test_timeout.rs
+++ b/tests/by-util/test_timeout.rs
@@ -9,3 +9,11 @@ fn test_subcommand_return_code() {
 
     new_ucmd!().arg("1").arg("false").run().status_code(1);
 }
+
+#[test]
+fn test_command_with_args() {
+    new_ucmd!()
+        .args(&["1700", "echo", "-n", "abcd"])
+        .succeeds()
+        .stdout_only("abcd");
+}