diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-07-11 17:32:14 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-07-11 17:32:14 +0000 |
| commit | c1270088401f1e3f4f8a6bfa2ff5b7228c4a8da0 (patch) | |
| tree | 06b6690e1666bbdccc2b7bb809f3c1bbd8ce2ac3 /libbb | |
| parent | 481d19b38e068e7db8459cb0e108f8049ce5919d (diff) | |
| download | busybox-c1270088401f1e3f4f8a6bfa2ff5b7228c4a8da0.tar.gz | |
Allow unarchive to redirect stdout (tobe used by dpkg applet)
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/libbb.h | 2 | ||||
| -rw-r--r-- | libbb/unarchive.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libbb/libbb.h b/libbb/libbb.h index 0fc704501..4a4b9191c 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -239,7 +239,7 @@ enum extract_functions_e { extract_unconditional = 512, extract_create_leading_dirs = 1024 }; -char *unarchive(FILE *src_stream, file_header_t *(*get_header)(FILE *), +char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_header)(FILE *), const int extract_function, const char *prefix, char **extract_names); char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function, const char *prefix, const char *filename); diff --git a/libbb/unarchive.c b/libbb/unarchive.c index 067e78b84..d95f2cfc7 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -211,7 +211,7 @@ char *extract_archive(FILE *src_stream, FILE *out_stream, const file_header_t *f #endif #ifdef L_unarchive -char *unarchive(FILE *src_stream, file_header_t *(*get_headers)(FILE *), +char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers)(FILE *), const int extract_function, const char *prefix, char **extract_names) { file_header_t *file_entry; @@ -237,7 +237,7 @@ char *unarchive(FILE *src_stream, file_header_t *(*get_headers)(FILE *), continue; } } - buffer = extract_archive(src_stream, stdout, file_entry, extract_function, prefix); + buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix); } return(buffer); } @@ -568,7 +568,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, /* open a stream of decompressed data */ uncompressed_stream = gz_open(deb_stream, &gunzip_pid); archive_offset = 0; - output_buffer = unarchive(uncompressed_stream, get_header_tar, extract_function, prefix, file_list); + output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, extract_function, prefix, file_list); } seek_sub_file(deb_stream, ar_header->size); } |