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 d49329ce91c75bfd17f53f3951be945f1b45a022..a1bcb1f9c7fffc440050cf1add204501f5853503 100644 (file)
--- 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();
 
@@ -63,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->ah_flags |= ARCHIVE_PRESERVE_DATE;
+               archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
        }
        if (opt & AR_OPT_VERBOSE) {
                archive_handle->action_header = header_verbose_list_ar;
@@ -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, "!<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;
 }