typo fix in a comment in a testcase. oh well...

[oweals/busybox.git] / archival / ar.c

diff --git a/archival/ar.c b/archival/ar.c
index 7b16c2b5925852ea5902f08d26cf03557fe34850..a1bcb1f9c7fffc440050cf1add204501f5853503 100644 (file)
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -3,7 +3,6 @@
  * Mini ar implementation for busybox
  *
  * Copyright (C) 2000 by Glenn McGrath
- * Written by Glenn McGrath <bug1@iinet.net.au> 1 June 2000
  *
  * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
  *
@@ -17,7 +16,7 @@
 #include "libbb.h"
 #include "unarchive.h"
 
-static void header_verbose_list_ar(const file_header_t *file_header)
+static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
 {
        const char *mode = bb_mode_string(file_header->mode);
        char *mtime;
@@ -38,7 +37,7 @@ static void header_verbose_list_ar(const file_header_t *file_header)
 #define AR_OPT_CREATE          0x20
 #define AR_OPT_INSERT          0x40
 
-int ar_main(int argc, char **argv);
+int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc, char **argv)
 {
        static const char msg_unsupported_err[] ALIGN1 =
@@ -46,13 +45,12 @@ int ar_main(int argc, char **argv)
 
        archive_handle_t *archive_handle;
        unsigned opt;
-       char magic[8];
 
        archive_handle = init_handle();
 
        /* Prepend '-' to the first argument if required */
        opt_complementary = "--:p:t:x:-1:p--tx:t--px:x--pt";
-       opt = getopt32(argc, argv, "ptxovcr");
+       opt = getopt32(argv, "ptxovcr");
 
        if (opt & AR_CTX_PRINT) {
                archive_handle->action_data = data_extract_to_stdout;
@@ -64,7 +62,7 @@ int ar_main(int argc, char **argv)
                archive_handle->action_data = data_extract_all;
        }
        if (opt & AR_OPT_PRESERVE_DATE) {
-               archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
+               archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
        }
        if (opt & AR_OPT_VERBOSE) {
                archive_handle->action_header = header_verbose_list_ar;
@@ -83,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, "!<arch>", 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;
 }