diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-16 22:46:01 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-16 22:46:01 +0100 |
| commit | 425ad9c93b2736a0ebfbba6267bc1ad56c49d156 (patch) | |
| tree | a927ce59974a130f40ac93537b5dacaed668e77b /archival/dpkg.c | |
| parent | dbc6a7a8fd33c79037c7f2894c24f271b714e3bc (diff) | |
| download | busybox-425ad9c93b2736a0ebfbba6267bc1ad56c49d156.tar.gz | |
libunarchive: move dpkg-specific things into dpkg.c. 0 byte size differences
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/dpkg.c')
| -rw-r--r-- | archival/dpkg.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 451c6fa32..2e24541bf 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1469,6 +1469,14 @@ static void init_archive_deb_data(archive_handle_t *ar_handle) ar_handle->sub_archive = tar_handle; } +static void FAST_FUNC data_extract_to_buffer(archive_handle_t *archive_handle) +{ + unsigned size = archive_handle->file_header->size; + + archive_handle->ah_buffer = xzalloc(size + 1); + xread(archive_handle->src_fd, archive_handle->ah_buffer, size); +} + static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *myaccept) { ar_handle->sub_archive->action_data = data_extract_to_buffer; @@ -1478,7 +1486,7 @@ static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, lli unpack_ar_archive(ar_handle); close(ar_handle->src_fd); - return ar_handle->sub_archive->buffer; + return ar_handle->sub_archive->ah_buffer; } static void FAST_FUNC data_extract_all_prefix(archive_handle_t *archive_handle) @@ -1487,7 +1495,7 @@ static void FAST_FUNC data_extract_all_prefix(archive_handle_t *archive_handle) name_ptr += strspn(name_ptr, "./"); if (name_ptr[0] != '\0') { - archive_handle->file_header->name = xasprintf("%s%s", archive_handle->buffer, name_ptr); + archive_handle->file_header->name = xasprintf("%s%s", archive_handle->ah_buffer, name_ptr); data_extract_all(archive_handle); } } @@ -1530,7 +1538,7 @@ static void unpack_package(deb_file_t *deb_file) archive_handle->sub_archive->accept = accept_list; archive_handle->sub_archive->filter = filter_accept_list; archive_handle->sub_archive->action_data = data_extract_all_prefix; - archive_handle->sub_archive->buffer = info_prefix; + archive_handle->sub_archive->ah_buffer = info_prefix; archive_handle->sub_archive->ah_flags |= ARCHIVE_UNLINK_OLD; unpack_ar_archive(archive_handle); @@ -1541,7 +1549,7 @@ static void unpack_package(deb_file_t *deb_file) archive_handle = init_archive_deb_ar(deb_file->filename); init_archive_deb_data(archive_handle); archive_handle->sub_archive->action_data = data_extract_all_prefix; - archive_handle->sub_archive->buffer = (char*)"/"; /* huh? */ + archive_handle->sub_archive->ah_buffer = (char*)"/"; /* huh? */ archive_handle->sub_archive->ah_flags |= ARCHIVE_UNLINK_OLD; unpack_ar_archive(archive_handle); |