Remove debugging statement.

[oweals/busybox.git] / ar.c

diff --git a/ar.c b/ar.c
index 8ab38682139112fc3c89d06eece9987744e53593..2a764ff5e9b158d6ef1c397aabc64860a2ece659 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -24,42 +24,37 @@
  */
 #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)
 {
-       const int preserve_date = 1;    /* preserve original dates */
-       const int verbose = 2;          /* be verbose */
-       const int display = 4;          /* display contents */
-       const int extract_to_file = 8;  /* extract contents of archive */
-       const int extract_to_stdout = 16;       /* extract to stdout */
-
-       FILE *src_file = NULL, *dst_file = NULL;
-       int funct = 0, opt=0;
-
-       ar_headers_t *head, *extract_list=NULL;
-
-       extract_list = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
-       head = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
+       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;
 
        while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
                switch (opt) {
                case 'o':
-                       funct |= preserve_date;
+                       extract_function |= extract_preserve_date;
                        break;
                case 'v':
-                       funct |= verbose;
+                       extract_function |= extract_verbose_list;
                        break;
                case 't':
-                       funct |= display;
+                       extract_function |= extract_list;
                        break;
                case 'p':
-                       funct |= extract_to_stdout;
+                       extract_function |= extract_to_stdout;
                        break;
                case 'x':
-                       funct |= extract_to_file;
+                       extract_function |= extract_all_to_fs;
                        break;
                default:
                        show_usage();
@@ -71,57 +66,24 @@ extern int ar_main(int argc, char **argv)
                show_usage();
        }
 
-       if ( (src_file = wfopen(argv[optind], "r")) < 0) {
-               error_msg_and_die("Cannot read %s", argv[optind]);
-       }
+       src_stream = xfopen(argv[optind++], "r");
 
-       optind++;       
-       head = get_ar_headers(src_file);
-       /* find files to extract or display */
-       /* search through argv and build extract list */
-       for (;optind < argc; optind++) {
-               ar_headers_t *ar_entry;
-               ar_entry = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
-               ar_entry = head;
-               while (ar_entry->next != NULL) {
-                       if (strcmp(argv[optind], ar_entry->name) == 0) {
-                               ar_headers_t *tmp;
-                               tmp = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
-                               *tmp = *extract_list;
-                               *extract_list = *ar_entry;
-                               extract_list->next = tmp;
-                               break;                                  
-                       }
-                       ar_entry=ar_entry->next;
-               }
+       /* check ar magic */
+       fread(ar_magic, 1, 8, src_stream);
+       if (strncmp(ar_magic,"!<arch>",7) != 0) {
+               error_msg_and_die("invalid magic");
        }
+       archive_offset = 8;
 
-       /* if individual files not found extract all files */   
-       if (extract_list->next==NULL) {
-               extract_list = head;
+       extract_names = malloc(sizeof(char *));
+       extract_names[0] = NULL;
+       while (optind < argc) {
+               num_of_entries++;
+               *extract_names = realloc(*extract_names, num_of_entries);
+               extract_names[num_of_entries - 1] = xstrdup(argv[optind]);
+               optind++;
        }
 
-       /* find files to extract or display */  
-       while (extract_list->next != NULL) {
-               if (funct & extract_to_file) {
-                       dst_file = wfopen(extract_list->name, "w");                             
-               }
-               else if (funct & extract_to_stdout) {
-                       dst_file = stdout;
-               }
-               if ((funct & extract_to_file) || (funct & extract_to_stdout)) {
-                       fseek(src_file, extract_list->offset, SEEK_SET);
-                       copy_file_chunk(src_file, dst_file, (off_t) extract_list->size);                        
-               }
-               if (funct & verbose) {
-                       printf("%s %d/%d %8d %s ", mode_string(extract_list->mode), 
-                               extract_list->uid, extract_list->gid,
-                               (int) extract_list->size, time_string(extract_list->mtime));
-               }
-               if ((funct & display) || (funct & verbose)){
-                       printf("%s\n", extract_list->name);
-               }
-               extract_list=extract_list->next;
-       }
+       unarchive(src_stream, stdout, &get_header_ar, extract_function, "./", extract_names);
        return EXIT_SUCCESS;
 }