ar: heh, there *was* "-1" already...

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

diff --git a/archival/ar.c b/archival/ar.c
index 3bb75879bac37ed4d77a1126caeb5d6c7a6a0741..fd7f8e4dba28c0d23410e49ea5fe98bc7cec8b79 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.
  *
@@ -14,18 +13,10 @@
  * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
  */
 
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-
+#include "libbb.h"
 #include "unarchive.h"
-#include "busybox.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;
@@ -34,7 +25,8 @@ static void header_verbose_list_ar(const file_header_t *file_header)
        mtime[16] = ' ';
        memmove(&mtime[17], &mtime[20], 4);
        mtime[21] = '\0';
-       printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name);
+       printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid,
+                       (int) file_header->size, &mtime[4], file_header->name);
 }
 
 #define AR_CTX_PRINT           0x01
@@ -45,19 +37,21 @@ 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 UNUSED_PARAM, char **argv)
 {
+       static const char msg_unsupported_err[] ALIGN1 =
+               "archive %s is not supported";
+
        archive_handle_t *archive_handle;
-       unsigned long opt;
-       static const char msg_unsupported_err[] =
-                       "Archive %s not supported.  Install binutils 'ar'.";
-       char magic[8];
+       unsigned opt;
 
        archive_handle = init_handle();
 
        /* Prepend '-' to the first argument if required */
-       bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt";
-       opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
+       opt_complementary = "--:p:t:x:-1:p--tx:t--px:x--pt";
+       opt = getopt32(argv, "ptxovcr");
+       argv += optind;
 
        if (opt & AR_CTX_PRINT) {
                archive_handle->action_data = data_extract_to_stdout;
@@ -69,7 +63,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;
@@ -81,20 +75,14 @@ int ar_main(int argc, char **argv)
                bb_error_msg_and_die(msg_unsupported_err, "insertion");
        }
 
-       archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
+       archive_handle->src_fd = xopen(*argv++, O_RDONLY);
 
-       while (optind < argc) {
+       while (*argv) {
                archive_handle->filter = filter_accept_list;
-               llist_add_to(&(archive_handle->accept), argv[optind++]);
-       }
-
-       archive_xread_all(archive_handle, magic, 7);
-       if (strncmp(magic, "!<arch>", 7) != 0) {
-               bb_error_msg_and_die("Invalid ar magic");
+               llist_add_to(&archive_handle->accept, *argv++);
        }
-       archive_handle->offset += 7;
 
-       while (get_header_ar(archive_handle) == EXIT_SUCCESS);
+       unpack_ar_archive(archive_handle);
 
        return EXIT_SUCCESS;
 }