forgot to remove some debugging noise
[oweals/busybox.git] / ar.c
diff --git a/ar.c b/ar.c
index 253f3348a51dec812717133ce7bd705816ae7095..59f51815fe88355ee89d7183e2b2518c3b017f42 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
-       ;
-
-static void displayContents(struct ArInfo *entry, int funct)
-{
-       /* 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);
-}
-
-/* Converts to new typed struct */
-static int readArHeader(struct ArHeader *rawHeader, struct ArInfo *header)
-{
-       int count2;
-       int count;
-
-       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);
-}
-
-/*
- * 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];
-
-       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);
-               }
-               copySize -= doneSize;
-       }
-       return (TRUE);
-}
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
+#include "busybox.h"
+
+typedef struct ar_headers_s {
+       char *name;
+       size_t size;
+       uid_t uid;
+       gid_t gid;
+       mode_t mode;
+       time_t mtime;
+       off_t offset;
+       struct ar_headers_s *next;
+} ar_headers_t;
 
 /*
- * 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
+ * return the headerL_t struct for the filename descriptor
  */
-static int extractToFile(int srcFd, const char *path, const char *name,
-                                                int size)
+extern ar_headers_t get_ar_headers(int srcFd)
 {
-       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);
-               }
+       typedef struct raw_ar_header_s {        /* Byte Offset */
+               char name[16];  /*  0-15 */
+               char date[12];  /* 16-27 */
+               char uid[6];    
+               char gid[6];    /* 28-39 */
+               char mode[8];   /* 40-47 */
+               char size[10];  /* 48-57 */
+               char fmag[2];   /* 58-59 */
+       } raw_ar_header_t;
+
+       raw_ar_header_t raw_ar_header;
+
+       ar_headers_t *head, *entry;
+       char ar_magic[8];
+       char *long_name=NULL;
+       
+       head = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
+       entry = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
+       
+       /* check ar magic */
+       if (full_read(srcFd, ar_magic, 8) != 8) {
+               error_msg_and_die("cannot read magic");
        }
-       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 (strncmp(ar_magic,"!<arch>",7) != 0) {
+               error_msg_and_die("invalid magic");
        }
-       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;
+       while (full_read(srcFd, (char *) &raw_ar_header, 60)==60) {
+               /* check the end of header markers are valid */
+               if ((raw_ar_header.fmag[0]!='`') || (raw_ar_header.fmag[1]!='\n')) {
+                       char newline;
+                       if (raw_ar_header.fmag[1]!='`') {
+                               break;
+                       }
+                       /* some version of ar, have an extra '\n' after each entry */
+                       read(srcFd, &newline, 1);
+                       if (newline!='\n') {
+                               break;
                        }
+                       /* fix up the header, we started reading 1 byte too early due to a '\n' */
+                       memmove((char *) &raw_ar_header, (char *)&raw_ar_header+1, 59);
+                       /* dont worry about adding the last '\n', we dont need it now */
                }
-               if ((extract == 1) && (found == 1)) {
-                       if (extToStdout == 1) {
-                               copySubFile(arFd, fileno(stdout), arEntry.size);
-                       } else {
-                               extractToFile(arFd, "./", arEntry.name, arEntry.size);
+               
+               entry->size = (size_t) atoi(raw_ar_header.size);
+               /* long filenames have '/' as the first character */
+               if (raw_ar_header.name[0] == '/') {
+                       if (raw_ar_header.name[1] == '/') {
+                               /* multiple long filenames are stored as data in one entry */
+                               long_name = (char *) xrealloc(long_name, entry->size);
+                               full_read(srcFd, long_name, entry->size);
+                               continue;
                        }
-               } else
-                       lseek(arFd, arEntry.size, SEEK_CUR);
+                       else {
+                               /* The number after the '/' indicates the offset in the ar data section
+                                       (saved in variable long_name) that conatains the real filename */
+                               const int long_name_offset = (int) atoi((char *) &raw_ar_header.name[1]);
+                               entry->name = xmalloc(strlen(&long_name[long_name_offset]));
+                               strcpy(entry->name, &long_name[long_name_offset]);
+                       }
+               }
+               else {
+                       /* short filenames */
+                       entry->name = xmalloc(16);
+                       strncpy(entry->name, raw_ar_header.name, 16);
+               }
+               entry->name[strcspn(entry->name, " /")]='\0';
+
+               /* convert the rest of the now valid char header to its typed struct */ 
+               parse_mode(raw_ar_header.mode, &entry->mode);
+               entry->mtime = atoi(raw_ar_header.date);
+               entry->uid = atoi(raw_ar_header.uid);
+               entry->gid = atoi(raw_ar_header.gid);
+               entry->offset = lseek(srcFd, 0, SEEK_CUR);
+
+               /* add this entries header to our combined list */
+               entry->next = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
+               *entry->next = *head;
+               *head = *entry;
+               lseek(srcFd, (off_t) entry->size, SEEK_CUR);
        }
-       return (0);
+       return(*head);
 }
 
 extern int ar_main(int argc, char **argv)
 {
-       int ret = 0;
-       char *opt_ptr;
-       char c;
-       int funct = 0;
+       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 */
+
+       int funct = 0, opt=0;
+       int srcFd=0, dstFd=0;
 
-       if (argc < 2)
-               usage(ar_usage);
+       ar_headers_t head, *extract_list=NULL;
 
-       opt_ptr = argv[1];
-       if (*opt_ptr == '-')
-               ++opt_ptr;
-       while ((c = *opt_ptr++) != '\0') {
-               switch (c) {
-               case 'o':                               /* preserver original dates */
-                       funct = funct | 1;
+       extract_list = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
+
+       while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
+               switch (opt) {
+               case 'o':
+                       funct |= preserve_date;
                        break;
-               case 'p':                               /* extract to stdout */
-                       funct = funct | 16;
+               case 'v':
+                       funct |= verbose;
                        break;
-               case 't':                               /* display contents */
-                       funct = funct | 4;
+               case 't':
+                       funct |= display;
                        break;
-               case 'x':                               /* extract contents of archive */
-                       funct = funct | 8;
+               case 'p':
+                       funct |= extract_to_stdout;
                        break;
-               case 'v':                               /* be verbose */
-                       funct = funct | 2;
+               case 'x':
+                       funct |= extract_to_file;
                        break;
                default:
-                       usage(ar_usage);
+                       show_usage();
+               }
+       }
+       /* check the src filename was specified */
+       if (optind == argc)
+               show_usage();
+       
+       if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
+               error_msg_and_die("Cannot read %s", argv[optind]);
+
+       optind++;       
+       head = get_ar_headers(srcFd);
+
+       /* 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 *) xmalloc(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;
+               }
+       }
+
+       /* if individual files not found extract all files */   
+       if (extract_list->next==NULL) {
+               extract_list = &head;
+       }
+       
+       /* find files to extract or display */  
+       while (extract_list->next != NULL) {
+               if (funct & extract_to_file) {
+                       dstFd = open(extract_list->name, O_WRONLY | O_CREAT, extract_list->mode);                               
+               }
+               else if (funct & extract_to_stdout) {
+                       dstFd = fileno(stdout);
+               }
+               if ((funct & extract_to_file) || (funct & extract_to_stdout)) {
+                       lseek(srcFd, extract_list->offset, SEEK_SET);
+                       copy_file_chunk(srcFd, dstFd, (size_t) extract_list->size);                     
+               }
+               if (funct & verbose) {
+                       printf("%s %d/%d %8d %s ", mode_string(extract_list->mode), 
+                               extract_list->uid, extract_list->gid,
+                               extract_list->size, time_string(extract_list->mtime));
+               }
+               if ((funct & display) || (funct & verbose)){
+                       printf("%s\n", extract_list->name);
                }
+               extract_list=extract_list->next;
        }
-       if (funct > 3)
-               ret = readArFile(argv, argc, funct);
-       return (ret);
+       return EXIT_SUCCESS;
 }