aboutsummaryrefslogtreecommitdiff
path: root/coreutils/timeout.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/timeout.c')
-rw-r--r--coreutils/timeout.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 4a6117f59..663303c2d 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -52,7 +52,8 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
52 int signo; 52 int signo;
53 int status; 53 int status;
54 int parent = 0; 54 int parent = 0;
55 int timeout = 10; 55 unsigned timeout;
56 const char *timeout_s = "10";
56 pid_t pid; 57 pid_t pid;
57#if !BB_MMU 58#if !BB_MMU
58 char *sv1, *sv2; 59 char *sv1, *sv2;
@@ -63,11 +64,12 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
63 64
64 /* -t SECONDS; -p PARENT_PID */ 65 /* -t SECONDS; -p PARENT_PID */
65 /* '+': stop at first non-option */ 66 /* '+': stop at first non-option */
66 getopt32(argv, "+s:t:+" USE_FOR_NOMMU("p:+"), &opt_s, &timeout, &parent); 67 getopt32(argv, "+s:t:" USE_FOR_NOMMU("p:+"), &opt_s, &timeout_s, &parent);
67 /*argv += optind; - no, wait for bb_daemonize_or_rexec! */ 68 /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
68 signo = get_signum(opt_s); 69 signo = get_signum(opt_s);
69 if (signo < 0) 70 if (signo < 0)
70 bb_error_msg_and_die("unknown signal '%s'", opt_s); 71 bb_error_msg_and_die("unknown signal '%s'", opt_s);
72 timeout = parse_duration_str((char*)timeout_s);
71 73
72 /* We want to create a grandchild which will watch 74 /* We want to create a grandchild which will watch
73 * and kill the grandparent. Other methods: 75 * and kill the grandparent. Other methods: