From 0381d422d9b40c0cf887d299224c7759875aefd8 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 10 Jul 2008 23:06:00 +0000 Subject: dpkg_deb: slight code shrink ar: reuse existing ar unpacking code get_header_tar: handle autodetection for tiny .tar.gz files too unarchive.h: do not include CONFIGed out things function old new delta get_header_tar 1521 1534 +13 dpkg_deb_main 400 380 -20 ar_main 260 196 -64 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/2 up/down: 13/-84) Total: -71 bytes --- archival/ar.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'archival/ar.c') diff --git a/archival/ar.c b/archival/ar.c index d49329ce9..dbff6775e 100644 --- a/archival/ar.c +++ b/archival/ar.c @@ -45,7 +45,6 @@ int ar_main(int argc, char **argv) archive_handle_t *archive_handle; unsigned opt; - char magic[8]; archive_handle = init_handle(); @@ -82,14 +81,7 @@ int ar_main(int argc, char **argv) llist_add_to(&(archive_handle->accept), argv[optind++]); } - xread(archive_handle->src_fd, magic, 7); - if (strncmp(magic, "!", 7) != 0) { - bb_error_msg_and_die("invalid ar magic"); - } - archive_handle->offset += 7; - - while (get_header_ar(archive_handle) == EXIT_SUCCESS) - continue; + unpack_ar_archive(archive_handle); return EXIT_SUCCESS; } -- cgit v1.2.3