diff options
author | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
commit | 01ff9c492111cf7d51ad074629d6e72bc69fc149 (patch) | |
tree | 394973e4e5f25dcd638185be75b84430c39ebab2 /e2fsprogs | |
parent | 9a2d9345377d38c428df6d3e0887956d359807ab (diff) | |
parent | 8bde71eb1502a5cdf186769b47d470038f99bc95 (diff) | |
download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip |
Merge branch 'busybox' into mergemerge
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/fsck.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index fd4ea737c..f7e93497d 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c | |||
@@ -423,13 +423,11 @@ static int wait_one(int flags) | |||
423 | /* if (G.noexecute) { already returned -1; } */ | 423 | /* if (G.noexecute) { already returned -1; } */ |
424 | 424 | ||
425 | while (1) { | 425 | while (1) { |
426 | pid = waitpid(-1, &status, flags); | 426 | pid = safe_waitpid(-1, &status, flags); |
427 | kill_all_if_got_signal(); | 427 | kill_all_if_got_signal(); |
428 | if (pid == 0) /* flags == WNOHANG and no children exited */ | 428 | if (pid == 0) /* flags == WNOHANG and no children exited */ |
429 | return -1; | 429 | return -1; |
430 | if (pid < 0) { | 430 | if (pid < 0) { |
431 | if (errno == EINTR) | ||
432 | continue; | ||
433 | if (errno == ECHILD) { /* paranoia */ | 431 | if (errno == ECHILD) { /* paranoia */ |
434 | bb_simple_error_msg("wait: no more children"); | 432 | bb_simple_error_msg("wait: no more children"); |
435 | return -1; | 433 | return -1; |