diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-04-04 16:22:54 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-04-04 16:22:54 +0100 |
| commit | 253dbd612b2d2f041f4263e15a3b94df70f41e36 (patch) | |
| tree | f6c6e12a0541233058a7f7ccb1251afeb457da06 /archival/libarchive | |
| parent | 3cf56a021d7a62512b477640e930e1a78288075c (diff) | |
| parent | d7d4750e1e213e7448147186dddfe3bfbb47eea0 (diff) | |
| download | busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.tar.gz busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.tar.bz2 busybox-w32-253dbd612b2d2f041f4263e15a3b94df70f41e36.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/libarchive')
| -rw-r--r-- | archival/libarchive/data_extract_to_command.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c index 6f5317a0e..5d8769382 100644 --- a/archival/libarchive/data_extract_to_command.c +++ b/archival/libarchive/data_extract_to_command.c | |||
| @@ -112,8 +112,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle) | |||
| 112 | bb_copyfd_exact_size(archive_handle->src_fd, p[1], -file_header->size); | 112 | bb_copyfd_exact_size(archive_handle->src_fd, p[1], -file_header->size); |
| 113 | close(p[1]); | 113 | close(p[1]); |
| 114 | 114 | ||
| 115 | if (safe_waitpid(pid, &status, 0) == -1) | 115 | status = wait_for_exitstatus(pid); |
| 116 | bb_perror_msg_and_die("waitpid"); | ||
| 117 | if (WIFEXITED(status) && WEXITSTATUS(status)) | 116 | if (WIFEXITED(status) && WEXITSTATUS(status)) |
| 118 | bb_error_msg_and_die("'%s' returned status %d", | 117 | bb_error_msg_and_die("'%s' returned status %d", |
| 119 | archive_handle->tar__to_command, WEXITSTATUS(status)); | 118 | archive_handle->tar__to_command, WEXITSTATUS(status)); |