diff options
| author | Ron Yorston <rmy@pobox.com> | 2020-03-29 09:30:21 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2020-03-29 09:30:21 +0100 |
| commit | 4ddcb317ac954cc371a86d5873ee231c3b8684ec (patch) | |
| tree | 80e06144f6daefeeffa69693394113177c1ae6b4 | |
| parent | e6680912a298dc2dee83f41837cb52160cf562d9 (diff) | |
| download | busybox-w32-4ddcb317ac954cc371a86d5873ee231c3b8684ec.tar.gz busybox-w32-4ddcb317ac954cc371a86d5873ee231c3b8684ec.tar.bz2 busybox-w32-4ddcb317ac954cc371a86d5873ee231c3b8684ec.zip | |
timeout: fix utter brokenness
The merge from upstream (commit d89ced75b, 2018-09-10) completely
broke timeout. Apply a belated fix.
| -rw-r--r-- | coreutils/timeout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coreutils/timeout.c b/coreutils/timeout.c index 258cd276f..1a9660183 100644 --- a/coreutils/timeout.c +++ b/coreutils/timeout.c | |||
| @@ -155,6 +155,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv) | |||
| 155 | #endif | 155 | #endif |
| 156 | BB_EXECVP_or_die(argv); | 156 | BB_EXECVP_or_die(argv); |
| 157 | #else /* ENABLE_PLATFORM_MINGW32 */ | 157 | #else /* ENABLE_PLATFORM_MINGW32 */ |
| 158 | argv += optind; | ||
| 158 | if ((ret=mingw_spawn_proc((const char **)argv)) == -1) { | 159 | if ((ret=mingw_spawn_proc((const char **)argv)) == -1) { |
| 159 | xfunc_error_retval = errno == EACCES ? 126 : 127; | 160 | xfunc_error_retval = errno == EACCES ? 126 : 127; |
| 160 | bb_perror_msg_and_die("can't execute '%s'", argv[0]); | 161 | bb_perror_msg_and_die("can't execute '%s'", argv[0]); |