diff options
| author | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-26 20:22:10 (EST) |
|---|---|---|
| committer | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-26 20:22:10 (EST) |
| commit | 8fdd042394b7395c13bee66afb45dd3875c60c63 (patch) | |
| tree | ee7ce27b3b440710d4f0b82e6e14fe0e483eb71e /libbb/unarchive.c | |
| parent | 6afed21188df0c417349563621302ec85f44096f (diff) | |
Check the unzip child process for errors and pass the upwards. Also, avoid child from being killed by SIGPIPE.
git-svn-id: http://opkg.googlecode.com/svn/trunk@392 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libbb/unarchive.c')
| -rw-r--r-- | libbb/unarchive.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c index 3108f37..c3630b0 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -624,6 +624,7 @@ deb_extract(const char *package_filename, FILE *out_stream, char *output_buffer = NULL; char *ared_file = NULL; char ar_magic[8]; + int gz_err; *err = 0; @@ -678,7 +679,9 @@ deb_extract(const char *package_filename, FILE *out_stream, extract_function, prefix, file_list, err); fclose(uncompressed_stream); - gz_close(gunzip_pid); + gz_err = gz_close(gunzip_pid); + if (gz_err) + *err = -1; free_header_ar(ar_header); break; } @@ -726,7 +729,9 @@ deb_extract(const char *package_filename, FILE *out_stream, free_header_tar(tar_header); fclose(uncompressed_stream); - gz_close(gunzip_pid); + gz_err = gz_close(gunzip_pid); + if (gz_err) + *err = -1; free_header_tar(tar_header); break; } @@ -734,7 +739,9 @@ deb_extract(const char *package_filename, FILE *out_stream, free_header_tar(tar_header); } fclose(unzipped_opkg_stream); - gz_close(unzipped_opkg_pid); + gz_err = gz_close(unzipped_opkg_pid); + if (gz_err) + *err = -1; goto cleanup; } else { |