Another update from Larry:
[oweals/busybox.git] / ar.c
diff --git a/ar.c b/ar.c
index 253f3348a51dec812717133ce7bd705816ae7095..4c3d0bbd5110e6c5974fcb6b9f65a883c5e1b266 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -3,8 +3,8 @@
  * Mini ar implementation for busybox 
  *
  * Copyright (C) 2000 by Glenn McGrath
- * Written by Glenn McGrath <bug1@netconnect.com.au> 1 June 2000
- *
+ * 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
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-
-
-#include <stdio.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>
-#include "internal.h"
-
-#define AR_BLOCK_SIZE 60
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#include "messages.c"
-
-struct ArHeader {                              /* Byte Offset */
-       char ar_name[16];                       /*  0-15 */
-       char ar_date[12];                       /* 16-27 */
-       char ar_uid[6], ar_gid[6];      /* 28-39 */
-       char ar_mode[8];                        /* 40-47 */
-       char ar_size[10];                       /* 48-57 */
-       char ar_fmag[2];                        /* 58-59 */
-};
-typedef struct ArHeader ArHeader;
-
-struct ArInfo {
-       char name[17];                          /* File name */
-       time_t date;                            /* long int, No of seconds since epoch */
-       uid_t uid;                                      /* unsigned int, Numeric UID */
-       gid_t gid;                                      /* unsigned int, Numeric GID */
-       mode_t mode;                            /* unsigned int, Unix mode */
-       size_t size;                            /* int, Size of the file */
-};
-typedef struct ArInfo ArInfo;
-
-static const char ar_usage[] = "ar [optxvV] archive [filenames] \n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nExtract or list files from an ar archive.\n\n"
-       "Options:\n"
-       "\to\t\tpreserve original dates\n"
-       "\tp\t\textract to stdout\n"
-       "\tt\t\tlist\n"
-       "\tx\t\textract\n"
-       "\tv\t\tverbosely list files processed\n"
-#endif
-       ;
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
+#include "busybox.h"
 
-static void displayContents(struct ArInfo *entry, int funct)
+extern int ar_main(int argc, char **argv)
 {
-       /* TODO convert mode to string */
-       if ((funct & 2) == 2)
-               printf("%i %i/%i %6i %s ", entry->mode, entry->uid, entry->gid,
-                          entry->size, timeString(entry->date));
-       printf("%s\n", entry->name);
-}
+       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 */
 
-/* Converts to new typed struct */
-static int readArHeader(struct ArHeader *rawHeader, struct ArInfo *header)
-{
-       int count2;
-       int count;
+       FILE *src_file = NULL, *dst_file = NULL;
+       int funct = 0, opt=0;
 
-       for (count = 0; count < 16; count++) {
-               if (rawHeader->ar_name[count] == ' ') {
-                       for (count2 = count; count2 < 16; count2++)
-                               if (!isspace(rawHeader->ar_name[count2]))
-                                       break;
-                       if (count2 >= 16)
-                               break;
-               }
-               if (rawHeader->ar_name[count] == '/')
-                       break;
-               header->name[count] = rawHeader->ar_name[count];
-       }
-       header->name[count] = '\0';
-       header->date = atoi(rawHeader->ar_date);
-       header->uid = atoi(rawHeader->ar_uid);
-       header->gid = atoi(rawHeader->ar_gid);
-       header->mode = atoi(rawHeader->ar_mode);
-       header->size = atoi(rawHeader->ar_size);
-       return (TRUE);
-}
+       ar_headers_t *head, *ar_extract_list=NULL;
 
-/*
- * Copy size bytes from current position if srcFd to current position in dstFd
- * taken from tarExtractRegularFile in tar.c
- * could be used for ar, tar and copyFile .  
- */
-static int copySubFile(int srcFd, int dstFd, int copySize)
-{
-       int readSize, writeSize, doneSize;
-       char buffer[BUFSIZ];
+       ar_extract_list = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
+       head = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
 
-       while (copySize > 0) {
-               if (copySize > BUFSIZ)
-                       readSize = BUFSIZ;
-               else
-                       readSize = copySize;
-               writeSize = fullRead(srcFd, buffer, readSize);
-               if (writeSize <= 0) {
-                       errorMsg(io_error, "copySubFile :", strerror(errno));
-                       return (FALSE);
-               }
-               doneSize = fullWrite(dstFd, buffer, writeSize);
-               if (doneSize <= 0) {
-                       errorMsg(io_error, "copySubFile :", strerror(errno));
-                       return (FALSE);
+       while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
+               switch (opt) {
+               case 'o':
+                       funct |= preserve_date;
+                       break;
+               case 'v':
+                       funct |= verbose;
+                       break;
+               case 't':
+                       funct |= display;
+                       break;
+               case 'p':
+                       funct |= extract_to_stdout;
+                       break;
+               case 'x':
+                       funct |= extract_to_file;
+                       break;
+               default:
+                       show_usage();
                }
-               copySize -= doneSize;
        }
-       return (TRUE);
-}
-
-/*
- * Need to add checks, stat newfile before creation,change mode from 0777
- * extract to current dir
- * dstStat.st_size copied from current position of file pointed to by srcFd
- */
-static int extractToFile(int srcFd, const char *path, const char *name,
-                                                int size)
-{
-       int dstFd, temp;
-       struct stat tmpStat;
-       char *pathname = NULL;
-
-       if ((temp = isDirectory(path, TRUE, &tmpStat)) != TRUE) {
-               if (!createPath(path, 0777)) {
-                       fatalError("Cannot extract to specified path");
-                       return (FALSE);
-               }
+       /* check the src filename was specified */
+       if (optind == argc) {
+               show_usage();
        }
-       temp = (strlen(path) + 16);
-       pathname = (char *) xmalloc(temp);
-       pathname = strcpy(pathname, path);
-       pathname = strcat(pathname, &name[0]);
-       dstFd = device_open(pathname, O_WRONLY | O_CREAT);
-       pathname = NULL;
-       temp = copySubFile(srcFd, dstFd, size);
-       close(dstFd);
-       return (TRUE);
-}
 
-/* Step through the ar file entries  */
-static int readArFile(char **fileNames, int argc, int funct)
-{
-       int arFd = 0;
-       int pdates = 0;
-       int verbose = 0;
-       int display = 0;
-       int extract = 0;
-       int extToStdout = 0;
-       int status = 0;
-       int found = 0;
-       ArHeader rawArHeader;
-       ArInfo arEntry;
-       char arVersion[8];
-       char *arName;
-       char *selName[argc - 2];
-       int i;
-
-       if ((funct & 1) == 1)
-               pdates = 1;
-       if ((funct & 2) == 2)
-               verbose = 1;
-       if ((funct & 4) == 4)
-               display = 1;
-       if ((funct & 16) == 16) {       /* extract to stdout */
-               extract = 1;
-               extToStdout = 1;
-       }
-       if ((funct & 8) == 8) {         /* extract to file */
-               extract = 1;
+       if ( (src_file = wfopen(argv[optind], "r")) < 0) {
+               error_msg_and_die("Cannot read %s", argv[optind]);
        }
-       arName = fileNames[2];
-       for (i = 0; i < (argc - 3); i++)
-               selName[i] = fileNames[i + 3];
-       arFd = open(arName, O_RDONLY);
-       if (arFd < 0) {
-               errorMsg("Error opening '%s': %s\n", arName, strerror(errno));
-               return (FALSE);
-       }
-       if (fullRead(arFd, arVersion, 8) <= 0) {
-               errorMsg("ar: Unexpected EOF in archive\n");
-               return (FALSE);
-       }
-       if (strncmp(arVersion, "!<arch>", 7) != 0) {
-               errorMsg("ar header fails check ");
-               return (FALSE);
-       }
-       while ((status = fullRead(arFd, (char *) &rawArHeader, AR_BLOCK_SIZE))
-                  == AR_BLOCK_SIZE) {
-               readArHeader(&rawArHeader, &arEntry);
 
-               if (display == 1) {
-                       displayContents(&arEntry, funct);
-               }
-               if (argc == 3)
-                       found = 1;
-               else {
-                       found = 0;
-                       for (i = 0; i < (argc - 3); i++) {
-                               if ((status = (strcmp(selName[i], arEntry.name))) == 0)
-                                       found = 1;
+       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 = *ar_extract_list;
+                               *ar_extract_list = *ar_entry;
+                               ar_extract_list->next = tmp;
+                               break;                                  
                        }
+                       ar_entry=ar_entry->next;
                }
-               if ((extract == 1) && (found == 1)) {
-                       if (extToStdout == 1) {
-                               copySubFile(arFd, fileno(stdout), arEntry.size);
-                       } else {
-                               extractToFile(arFd, "./", arEntry.name, arEntry.size);
-                       }
-               } else
-                       lseek(arFd, arEntry.size, SEEK_CUR);
        }
-       return (0);
-}
 
-extern int ar_main(int argc, char **argv)
-{
-       int ret = 0;
-       char *opt_ptr;
-       char c;
-       int funct = 0;
-
-       if (argc < 2)
-               usage(ar_usage);
+       /* if individual files not found extract all files */   
+       if (ar_extract_list->next==NULL) {
+               ar_extract_list = head;
+       }
 
-       opt_ptr = argv[1];
-       if (*opt_ptr == '-')
-               ++opt_ptr;
-       while ((c = *opt_ptr++) != '\0') {
-               switch (c) {
-               case 'o':                               /* preserver original dates */
-                       funct = funct | 1;
-                       break;
-               case 'p':                               /* extract to stdout */
-                       funct = funct | 16;
-                       break;
-               case 't':                               /* display contents */
-                       funct = funct | 4;
-                       break;
-               case 'x':                               /* extract contents of archive */
-                       funct = funct | 8;
-                       break;
-               case 'v':                               /* be verbose */
-                       funct = funct | 2;
-                       break;
-               default:
-                       usage(ar_usage);
+       /* find files to extract or display */  
+       while (ar_extract_list->next != NULL) {
+               if (funct & extract_to_file) {
+                       dst_file = wfopen(ar_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, ar_extract_list->offset, SEEK_SET);
+                       copy_file_chunk(src_file, dst_file, ar_extract_list->size);                     
+               }
+               if (funct & verbose) {
+                       printf("%s %d/%d %8d %s ", mode_string(ar_extract_list->mode), 
+                               ar_extract_list->uid, ar_extract_list->gid,
+                               (int) ar_extract_list->size, time_string(ar_extract_list->mtime));
+               }
+               if ((funct & display) || (funct & verbose)){
+                       printf("%s\n", ar_extract_list->name);
                }
+               ar_extract_list = ar_extract_list->next;
        }
-       if (funct > 3)
-               ret = readArFile(argv, argc, funct);
-       return (ret);
+       return EXIT_SUCCESS;
 }