Fixed a memory leak in lash. It seems that close_all was calling close()
[oweals/busybox.git] / ar.c
diff --git a/ar.c b/ar.c
index 5803ad1a7096f7a2cd46858fec6f54983434e234..59f51815fe88355ee89d7183e2b2518c3b017f42 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -3,7 +3,7 @@
  * 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.
  *
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * Last modified 9 September 2000
  */
-#include <stdio.h>
-#include <string.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
+#include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <malloc.h>
-#include "internal.h"
-
-#define BLOCK_SIZE 60
-#define PRESERVE_DATE 1        /* preserve original dates */
-#define VERBOSE       2        /* be verbose */
-#define DISPLAY       4        /* display contents */
-#define EXT_TO_FILE   8        /* extract contents of archive */
-#define EXT_TO_STDOUT 16       /* extract to stdout */
-#define RECURSIVE     32        
-
-#define MAX_NAME_LENGTH 100
-
-//#define BB_DECLARE_EXTERN
-//#define bb_need_io_error
-//#include "messages.c"
-
-typedef struct rawArHeader {    /* Byte Offset */
-        char name[16];          /*  0-15 */
-        char date[12];          /* 16-27 */
-        char uid[6], gid[6];    /* 28-39 */
-        char mode[8];           /* 40-47 */
-        char size[10];          /* 48-57 */
-        char fmag[2];           /* 58-59 */
-} rawArHeader_t;
-
-typedef struct headerL {
-       char name[MAX_NAME_LENGTH];
-        size_t size;
-        uid_t uid;
-        gid_t gid;
-        mode_t mode;
-        time_t mtime;
-        off_t offset;
-       struct headerL *next;
-} headerL_t;
-
-/*
- * identify Ar header (magic) and set srcFd to first header entry 
- */
-static int checkArMagic(int srcFd)
-{
-        char arMagic[8];
-        if (fullRead(srcFd, arMagic, 8) != 8)
-                return (FALSE);
-        
-       if (strncmp(arMagic,"!<arch>",7) != 0)
-                return(FALSE);
-       return(TRUE);
-}
+#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;
 
 /*
- * read, convert and check the raw ar header
- * srcFd should be pointing to the start of header prior to entry
- * srcFd will be pointing at the start of data after successful exit
- * if returns FALSE srcFd is reset to initial position
+ * return the headerL_t struct for the filename descriptor
  */
-static int readRawArHeader(int srcFd, headerL_t *header)
+extern ar_headers_t get_ar_headers(int srcFd)
 {
-       rawArHeader_t rawArHeader;
-       off_t   initialOffset;
-       size_t nameLength;
+       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;
        
-       initialOffset = lseek(srcFd, 0, SEEK_CUR);
-       if (fullRead(srcFd, (char *) &rawArHeader, 60) != 60) {
-               lseek(srcFd, initialOffset, SEEK_SET);
-               return(FALSE);
-       }
-       if ((rawArHeader.fmag[0]!='`') || (rawArHeader.fmag[1]!='\n')) {
-               lseek(srcFd, initialOffset, SEEK_SET);
-               return(FALSE);
-       }
-
-       strncpy(header->name, rawArHeader.name, 16);
-       nameLength=strcspn(header->name, " \\");
-       header->name[nameLength]='\0';
-       parse_mode(rawArHeader.mode, &header->mode);
-        header->mtime = atoi(rawArHeader.date);
-        header->uid = atoi(rawArHeader.uid);
-        header->gid = atoi(rawArHeader.gid);
-        header->size = (size_t) atoi(rawArHeader.size);
-        header->offset = initialOffset + (off_t) 60;
-       return(TRUE); 
-}
-
-/*
- * get, check and correct the converted header
- */ 
-static int readArEntry(int srcFd, headerL_t *newEntry)
-{
-       size_t nameLength;
-
-       if(readRawArHeader(srcFd, newEntry)==FALSE)
-               return(FALSE);
-       
-       nameLength = strcspn(newEntry->name, "/");
+       head = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
+       entry = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
        
-       /* handle GNU style short filenames, strip trailing '/' */
-       if (nameLength > 0)
-               newEntry->name[nameLength]='\0';
-       
-       /* handle GNU style long filenames */ 
-       if (nameLength == 0) {
-               /* escape from recursive call */
-               if (newEntry->name[1]=='0') 
-                       return(TRUE);
+       /* check ar magic */
+       if (full_read(srcFd, ar_magic, 8) != 8) {
+               error_msg_and_die("cannot read magic");
+       }
 
-               /* the data section contains the real filename */
-               if (newEntry->name[1]=='/') {
-                       char tempName[MAX_NAME_LENGTH];
+       if (strncmp(ar_magic,"!<arch>",7) != 0) {
+               error_msg_and_die("invalid magic");
+       }
 
-                       if (newEntry->size > MAX_NAME_LENGTH)
-                               newEntry->size = MAX_NAME_LENGTH;
-                       fullRead(srcFd, tempName, newEntry->size);
-                       tempName[newEntry->size-3]='\0';
-                       
-                       /* read the second header for this entry */
-                       /* be carefull, this is recursive */
-                       if (readArEntry(srcFd, newEntry)==FALSE)
-                               return(FALSE);
+       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 ((newEntry->name[0]='/') && (newEntry->name[1]='0'))
-                               strcpy(newEntry->name, tempName);
+               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 {
-                               errorMsg("Invalid long filename\n");
-                               return(FALSE);
+                               /* 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]);
                        }
                }
-       }
-       return(TRUE);   
-}
-
-/*
- * return the headerL_t struct for the specified filename
- */
-static headerL_t *getHeaders(int srcFd, headerL_t *head, int funct)
-{
-       headerL_t *list;
-        list = (headerL_t *) malloc(sizeof(headerL_t));
-
-        if (checkArMagic(srcFd)==TRUE) {
-               printf("found ar header ");
-               while(readArEntry(srcFd, list) == TRUE) {
-                       list->next = (headerL_t *) malloc(sizeof(headerL_t));
-                       *list->next = *head;
-                       *head = *list;
-               
-                       /* recursive check for sub-archives */
-                       if ((funct & RECURSIVE) == RECURSIVE) 
-                               head = getHeaders(srcFd, head, funct);
-                       lseek(srcFd, head->offset + head->size, SEEK_SET);
+               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);
        }
-       else 
-               printf("not an ar header\n");
-        return(head);
+       return(*head);
 }
 
-/*
- * find an entry in the linked list matching the filename
- */
-static headerL_t *findEntry(headerL_t *head, const char *filename)
+extern int ar_main(int argc, char **argv)
 {
-       while(head->next != NULL) {
-               if (strcmp(filename, head->name)==0) 
-                       return(head);
-               head=head->next;
-       }
-       return(NULL);
-}
+       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 */
 
-/*
- * populate linked list with all ar file entries and offset 
- */
-static int displayEntry(headerL_t *head, int funct)
-{
-       if ((funct & VERBOSE) == VERBOSE) {
-               printf("%s %d/%d %8d %s ", modeString(head->mode), head->uid, head->gid, head->size, timeString(head->mtime));
-       }
-       printf("%s\n", head->name);
-       head = head->next;
-       return(TRUE);
-}
+       int funct = 0, opt=0;
+       int srcFd=0, dstFd=0;
 
-static int extractAr(int srcFd, int dstFd, headerL_t *file)
-{
-       lseek(srcFd, file->offset, SEEK_SET);
-       if (copySubFile(srcFd, dstFd, (size_t) file->size) == TRUE)
-               return(TRUE);   
-       return(FALSE);
-}
+       ar_headers_t head, *extract_list=NULL;
 
-extern int ar_main(int argc, char **argv)
-{
-        int funct = 0, opt=0;
-       int srcFd=0, dstFd=0;
-       headerL_t *header, *entry, *extractList;
+       extract_list = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
 
-       while ((opt = getopt(argc, argv, "ovtpxR")) != -1) {
+       while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
                switch (opt) {
                case 'o':
-                       funct = funct | PRESERVE_DATE;
+                       funct |= preserve_date;
                        break;
                case 'v':
-                       funct = funct | VERBOSE;
+                       funct |= verbose;
                        break;
                case 't':
-                       funct = funct | DISPLAY;
-                       break;
-               case 'x':
-                       funct = funct | EXT_TO_FILE;
+                       funct |= display;
                        break;
                case 'p':
-                       funct = funct | EXT_TO_STDOUT;
+                       funct |= extract_to_stdout;
                        break;
-               case 'R':
-                       funct = funct | RECURSIVE;
+               case 'x':
+                       funct |= extract_to_file;
                        break;
                default:
-                       usage(ar_usage);
+                       show_usage();
                }
        }
  
-        /* check the src filename was specified */
-       if (optind == argc) {
-                usage(ar_usage);
-                return(FALSE);
-        }
+       /* check the src filename was specified */
+       if (optind == argc)
+               show_usage();
        
-        if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) {
-               errorMsg("Cannot read %s\n", optarg);
-                return (FALSE);
-        }
-       optind++;       
-       entry = (headerL_t *) malloc(sizeof(headerL_t));
-       header = (headerL_t *) malloc(sizeof(headerL_t));
-       extractList = (headerL_t *) malloc(sizeof(headerL_t));  
+       if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
+               error_msg_and_die("Cannot read %s", argv[optind]);
+
+       optind++;       
+       head = get_ar_headers(srcFd);
 
-       header = getHeaders(srcFd, header, funct);
-       
        /* find files to extract or display */
-       if (optind<argc) {
-               /* only handle specified files */
-               while(optind < argc) { 
-                       if ( (entry = findEntry(header, argv[optind])) != NULL) {
-                               entry->next = (headerL_t *) malloc(sizeof(headerL_t));
-                               *entry->next = *extractList;
-                               *extractList = *entry;
+       /* 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;                                  
                        }
-                       optind++;
-               }       
+                       ar_entry=ar_entry->next;
+               }
+       }
+
+       /* if individual files not found extract all files */   
+       if (extract_list->next==NULL) {
+               extract_list = &head;
        }
-       else 
-               /* extract everything */
-               extractList = header;
        
-       while(extractList->next != NULL) {      
-               if ( (funct & EXT_TO_FILE) == EXT_TO_FILE) {
-                       dstFd = open(extractList->name, O_WRONLY | O_CREAT, extractList->mode);
-                       
-                       extractAr(srcFd, dstFd, extractList);
+       /* 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);
                }
-               if ( (funct & EXT_TO_STDOUT) == EXT_TO_STDOUT)  
-                       extractAr(srcFd, fileno(stdout), extractList);  
-               if ( (funct & DISPLAY) == DISPLAY)
-                       displayEntry(extractList, funct);
-               extractList=extractList->next;
+               extract_list=extract_list->next;
        }
-       return (TRUE);
+       return EXIT_SUCCESS;
 }