From f90975115538ba4d2043113f4cecf39bd17af94c Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Fri, 11 Jun 2021 20:44:25 +0200
Subject: [PATCH] timeout: don't kill the process if -k is not set

`timeout` used to set the timeout to 0 when -k was not set. This
collided with the behavior of 0 timeouts, which disable the timeout.
When -k is not set the process should not be killed.
---
 src/uu/timeout/src/timeout.rs | 52 +++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
index eabf0192a..bc92157ca 100644
--- a/src/uu/timeout/src/timeout.rs
+++ b/src/uu/timeout/src/timeout.rs
@@ -42,7 +42,7 @@ pub mod options {
 
 struct Config {
     foreground: bool,
-    kill_after: Duration,
+    kill_after: Option<Duration>,
     signal: usize,
     duration: Duration,
     preserve_status: bool,
@@ -66,10 +66,9 @@ impl Config {
             _ => uucore::signals::signal_by_name_or_value("TERM").unwrap(),
         };
 
-        let kill_after: Duration = match options.value_of(options::KILL_AFTER) {
-            Some(time) => uucore::parse_time::from_str(time).unwrap(),
-            None => Duration::new(0, 0),
-        };
+        let kill_after = options
+            .value_of(options::KILL_AFTER)
+            .map(|time| uucore::parse_time::from_str(time).unwrap());
 
         let duration: Duration =
             uucore::parse_time::from_str(options.value_of(options::DURATION).unwrap()).unwrap();
@@ -178,7 +177,7 @@ fn timeout(
     cmd: &[String],
     duration: Duration,
     signal: usize,
-    kill_after: Duration,
+    kill_after: Option<Duration>,
     foreground: bool,
     preserve_status: bool,
     verbose: bool,
@@ -217,27 +216,32 @@ fn timeout(
                 );
             }
             return_if_err!(ERR_EXIT_STATUS, process.send_signal(signal));
-            match process.wait_or_timeout(kill_after) {
-                Ok(Some(status)) => {
-                    if preserve_status {
-                        status.code().unwrap_or_else(|| status.signal().unwrap())
-                    } else {
-                        124
+            if let Some(kill_after) = kill_after {
+                match process.wait_or_timeout(kill_after) {
+                    Ok(Some(status)) => {
+                        if preserve_status {
+                            status.code().unwrap_or_else(|| status.signal().unwrap())
+                        } else {
+                            124
+                        }
                     }
-                }
-                Ok(None) => {
-                    if verbose {
-                        show_error!("sending signal KILL to command '{}'", cmd[0]);
+                    Ok(None) => {
+                        if verbose {
+                            show_error!("sending signal KILL to command '{}'", cmd[0]);
+                        }
+                        return_if_err!(
+                            ERR_EXIT_STATUS,
+                            process.send_signal(
+                                uucore::signals::signal_by_name_or_value("KILL").unwrap()
+                            )
+                        );
+                        return_if_err!(ERR_EXIT_STATUS, process.wait());
+                        137
                     }
-                    return_if_err!(
-                        ERR_EXIT_STATUS,
-                        process
-                            .send_signal(uucore::signals::signal_by_name_or_value("KILL").unwrap())
-                    );
-                    return_if_err!(ERR_EXIT_STATUS, process.wait());
-                    137
+                    Err(_) => 124,
                 }
-                Err(_) => 124,
+            } else {
+                124
             }
         }
         Err(_) => {