diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /miscutils/timeout.c | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'miscutils/timeout.c')
| -rw-r--r-- | miscutils/timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/timeout.c b/miscutils/timeout.c index 48b8d8fc0..841669416 100644 --- a/miscutils/timeout.c +++ b/miscutils/timeout.c | |||
| @@ -83,7 +83,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv) | |||
| 83 | bb_daemonize_or_rexec(0, argv); | 83 | bb_daemonize_or_rexec(0, argv); |
| 84 | /* Here we are grandchild. Sleep, then kill grandparent */ | 84 | /* Here we are grandchild. Sleep, then kill grandparent */ |
| 85 | grandchild: | 85 | grandchild: |
| 86 | /* Just sleep(NUGE_NUM); kill(parent) may kill wrong process! */ | 86 | /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */ |
| 87 | while (1) { | 87 | while (1) { |
| 88 | sleep(1); | 88 | sleep(1); |
| 89 | if (--timeout <= 0) | 89 | if (--timeout <= 0) |