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 7f3396c8cf9af0fc8f17096eb59191b1359622ed..a1bcb1f9c7fffc440050cf1add204501f5853503 100644 (file)
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -1,89 +1,87 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini ar implementation for busybox 
+ * Mini ar implementation for busybox
  *
  * Copyright (C) 2000 by Glenn McGrath
- * Written by Glenn McGrath <bug1@optushome.com.au> 1 June 2000
- *             
- * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
+ * There is no single standard to adhere to so ar may not portable
+ * between different systems
+ * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
  */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
-#include "busybox.h"
 
-extern int ar_main(int argc, char **argv)
+#include "libbb.h"
+#include "unarchive.h"
+
+static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
 {
-       FILE *src_stream = NULL;
-       char **extract_names = NULL;
-       char ar_magic[8];
-       int extract_function =  extract_unconditional;
-       int opt;
-       int num_of_entries = 0;
-       extern off_t archive_offset;
+       const char *mode = bb_mode_string(file_header->mode);
+       char *mtime;
 
-       while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
-               switch (opt) {
-               case 'o':
-                       extract_function |= extract_preserve_date;
-                       break;
-               case 'v':
-                       extract_function |= extract_verbose_list;
-                       break;
-               case 't':
-                       extract_function |= extract_list;
-                       break;
-               case 'p':
-                       extract_function |= extract_to_stdout;
-                       break;
-               case 'x':
-                       extract_function |= extract_all_to_fs;
-                       break;
-               default:
-                       show_usage();
-               }
-       }
- 
-       /* check the src filename was specified */
-       if (optind == argc) {
-               show_usage();
-       }
+       mtime = ctime(&file_header->mtime);
+       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);
+}
+
+#define AR_CTX_PRINT           0x01
+#define AR_CTX_LIST            0x02
+#define AR_CTX_EXTRACT         0x04
+#define AR_OPT_PRESERVE_DATE   0x08
+#define AR_OPT_VERBOSE         0x10
+#define AR_OPT_CREATE          0x20
+#define AR_OPT_INSERT          0x40
+
+int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ar_main(int argc, char **argv)
+{
+       static const char msg_unsupported_err[] ALIGN1 =
+               "archive %s is not supported";
 
-       src_stream = xfopen(argv[optind++], "r");
+       archive_handle_t *archive_handle;
+       unsigned opt;
 
-       /* check ar magic */
-       fread(ar_magic, 1, 8, src_stream);
-       archive_offset = 8;
-       if (strncmp(ar_magic,"!<arch>",7) != 0) {
-               error_msg_and_die("invalid magic");
+       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(argv, "ptxovcr");
+
+       if (opt & AR_CTX_PRINT) {
+               archive_handle->action_data = data_extract_to_stdout;
+       }
+       if (opt & AR_CTX_LIST) {
+               archive_handle->action_header = header_list;
+       }
+       if (opt & AR_CTX_EXTRACT) {
+               archive_handle->action_data = data_extract_all;
+       }
+       if (opt & AR_OPT_PRESERVE_DATE) {
+               archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
+       }
+       if (opt & AR_OPT_VERBOSE) {
+               archive_handle->action_header = header_verbose_list_ar;
+       }
+       if (opt & AR_OPT_CREATE) {
+               bb_error_msg_and_die(msg_unsupported_err, "creation");
+       }
+       if (opt & AR_OPT_INSERT) {
+               bb_error_msg_and_die(msg_unsupported_err, "insertion");
        }
 
-       /* Create a list of files to extract */
+       archive_handle->src_fd = xopen(argv[optind++], O_RDONLY);
+
        while (optind < argc) {
-               extract_names = xrealloc(extract_names, sizeof(char *) * (num_of_entries + 2));
-               extract_names[num_of_entries] = xstrdup(argv[optind]);
-               num_of_entries++;
-               extract_names[num_of_entries] = NULL;
-               optind++;
+               archive_handle->filter = filter_accept_list;
+               llist_add_to(&(archive_handle->accept), argv[optind++]);
        }
 
-       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names);
+       unpack_ar_archive(archive_handle);
+
        return EXIT_SUCCESS;
 }