diff options
| author | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2008-12-27 13:52:24 (EST) |
|---|---|---|
| committer | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2008-12-27 13:52:24 (EST) |
| commit | 2c6f8eda7145ce3e8645567aa930b16853770f94 (patch) | |
| tree | 426e9d269e3e99ae9e7552321ff7bc4b29e7ba5e /libbb/unarchive.c | |
| parent | dd36f3cc97446d704474366e711fa0cc6ffe0917 (diff) | |
revert R190, keep R191
Waiting for the patch fixing bugs.
git-svn-id: http://opkg.googlecode.com/svn/trunk@192 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libbb/unarchive.c')
| -rw-r--r-- | libbb/unarchive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c index 3251c71..bb70ccb 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -749,7 +749,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, while ((ar_header = get_header_ar(deb_stream)) != NULL) { if (strcmp(ared_file, ar_header->name) == 0) { /* open a stream of decompressed data */ - uncompressed_stream = gzvopen(deb_stream, &gunzip_pid); + uncompressed_stream = gz_open(deb_stream, &gunzip_pid); archive_offset = 0; output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list); } @@ -757,7 +757,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, free (ar_header->name); free (ar_header); } - gzvclose(gunzip_pid); + gz_close(gunzip_pid); fclose(deb_stream); fclose(uncompressed_stream); free(ared_file); @@ -769,7 +769,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, file_header_t *tar_header; archive_offset = 0; fseek(deb_stream, 0, SEEK_SET); - unzipped_opkg_stream = gzvopen(deb_stream, &unzipped_opkg_pid); + unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid); /*fprintf(stderr, __FUNCTION__ ": processing opkg %s -- ared_file=%s\n", package_filename, ared_file);*/ /* walk through outer tar file to find ared_file */ @@ -779,7 +779,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, name_offset = 2; if (strcmp(ared_file, tar_header->name+name_offset) == 0) { /* open a stream of decompressed data */ - uncompressed_stream = gzvopen(unzipped_opkg_stream, &gunzip_pid); + uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid); archive_offset = 0; /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/ output_buffer = unarchive(uncompressed_stream, @@ -791,14 +791,14 @@ char *deb_extract(const char *package_filename, FILE *out_stream, file_list); /*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/ free_header_tar(tar_header); - gzvclose(gunzip_pid); + gz_close(gunzip_pid); fclose(uncompressed_stream); break; } seek_sub_file(unzipped_opkg_stream, tar_header->size); free_header_tar(tar_header); } - gzvclose(unzipped_opkg_pid); + gz_close(unzipped_opkg_pid); fclose(unzipped_opkg_stream); fclose(deb_stream); free(ared_file); |