emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tar,rpm2cpio: check that child decompressor did not error out

Browse Source 
function                                             old     new   delta
check_errors_in_children                               -      57     +57
tar_main                                             833     848     +15
get_header_tar                                      1720    1733     +13
rpm2cpio_main                                        147     140      -7
handle_SIGCHLD                                        41       -     -41
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/1 up/down: 85/-48)             Total: 37 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2012-03-06 16:33:42 +01:00
parent 02c3c38420
commit faac1d3e6e
4 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
archival/libarchive/open_transformer.c
View File

@@ -27,6 +27,32 @@ int FAST_FUNC check_signature16(transformer_aux_data_t *aux, int src_fd, unsigne
return 0;
}
void check_errors_in_children(int signo)
{
int status;
if (!signo) {
/* block waiting for any child */
if (wait(&status) < 0)
return; /* probably there are no children */
goto check_status;
}
/* Wait for any child without blocking */
for (;;) {
if (wait_any_nohang(&status) < 0)
/* wait failed?! I'm confused... */
return;
check_status:
if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
/* this child exited with 0 */
continue;
/* Cannot happen?
if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
bb_got_signal = 1;
}
}
/* transformer(), more than meets the eye */
#if BB_MMU
void FAST_FUNC open_transformer(int fd,