Patch from Konstantin Isakov <ikm@pisem.net>:
[oweals/busybox.git] / archival / ar.c
index bd54bb6b869b5806cb2ab710d8cfc1ab70a9f49c..9979273466c2e0221614bff4e90080781e9d8f3d 100644 (file)
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * There is no signle 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 <sys/types.h>
 #include <fcntl.h>
+#include <fnmatch.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <utime.h>
+#include <unistd.h>
+#include <getopt.h>
+#include "unarchive.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;
-
-/*
- * return the headerL_t struct for the filename descriptor
- */
-static ar_headers_t get_headers(int srcFd)
+static void header_verbose_list_ar(const file_header_t *file_header)
 {
-       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;
+       const char *mode = mode_string(file_header->mode);
+       char *mtime;
 
-       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\n");
-       if (strncmp(ar_magic,"!<arch>",7) != 0)
-               error_msg_and_die("invalid magic\n");
+       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);
+}
 
-       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[1];
-                       if (raw_ar_header.fmag[1]!='`') {
-                               break;
-                       }
-                       /* some version of ar, have an extra '\n' after each entry */
-                       read(srcFd, newline, 1);
-                       if (newline[0]!='\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 */
-               }
-               
-               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 {
-                               /* 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';
+#if defined CONFIG_TAR | defined CONFIG_DPKG_DEB | defined CONFIG_CPIO
+/* This is simpler than data_extract_all */
+static void data_extract_regular_file(archive_handle_t *archive_handle)
+{
+       file_header_t *file_header;
+       int dst_fd;
+
+       file_header = archive_handle->file_header;
+       dst_fd = xopen(file_header->name, O_WRONLY | O_CREAT);
+       copy_file_chunk_fd(archive_handle->src_fd, dst_fd, file_header->size);
+       close(dst_fd);
 
-               /* 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);
+       chmod(file_header->name, file_header->mode);
+       chown(file_header->name, file_header->uid, file_header->gid);
 
-               /* 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);
+       if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) {
+               struct utimbuf t;
+               t.actime = t.modtime = file_header->mtime;
+               utime(file_header->name, &t);
        }
-       return(*head);
+
+       return;
 }
+#endif
 
 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 */
-
-       int funct = 0, opt=0;
-       int srcFd=0, dstFd=0;
+       archive_handle_t *archive_handle;
+       int opt;
 
-       ar_headers_t head, *extract_list=NULL;
+#ifndef CONFIG_DPKG_DEB
+       char magic[8];
+#endif
+#if defined CONFIG_TAR | defined CONFIG_DPKG_DEB | defined CONFIG_CPIO
+       archive_handle = init_handle();
+#else
+       archive_handle = xcalloc(1, sizeof(archive_handle_t));
+       archive_handle->filter = filter_accept_all;
+       archive_handle->action_data = data_skip;
+       archive_handle->action_header = header_skip;
+       archive_handle->file_header =xmalloc(sizeof(file_header_t));
+#endif
 
-       extract_list = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
-
-       while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
+       while ((opt = getopt(argc, argv, "covtpxX")) != -1) {
                switch (opt) {
-               case 'o':
-                       funct |= preserve_date;
+               case 'p':       /* print */
+                       archive_handle->action_data = data_extract_to_stdout;
                        break;
-               case 'v':
-                       funct |= verbose;
+               case 't':       /* list contents */
+                       archive_handle->action_header = header_list;
                        break;
-               case 't':
-                       funct |= display;
+               case 'X':
+                       archive_handle->action_header = header_verbose_list_ar;
+               case 'x':       /* extract */
+#if defined CONFIG_TAR | defined CONFIG_DPKG_DEB | defined CONFIG_CPIO
+                       archive_handle->action_data = data_extract_all;
+#else
+                       archive_handle->action_data = data_extract_regular_file;
+#endif
                        break;
-               case 'p':
-                       funct |= extract_to_stdout;
+               /* Modifiers */
+               case 'o':       /* preserve original dates */
+                       archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
                        break;
-               case 'x':
-                       funct |= extract_to_file;
+               case 'v':       /* verbose */
+                       archive_handle->action_header = header_verbose_list_ar;
                        break;
                default:
-                       usage(ar_usage);
+                       show_usage();
                }
        }
  
        /* check the src filename was specified */
-       if (optind == argc)
-               usage(ar_usage);
-       
-       if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
-               error_msg_and_die("Cannot read %s\n", argv[optind]);
+       if (optind == argc) {
+               show_usage();
+       }
 
-       optind++;       
-       head = get_headers(srcFd);
+       archive_handle->src_fd = xopen(argv[optind++], O_RDONLY);
 
-       /* 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;
-               }
+       /* TODO: This is the same as in tar, seperate function ? */
+       while (optind < argc) {
+               archive_handle->filter = filter_accept_list;
+               archive_handle->accept = add_to_list(archive_handle->accept, argv[optind]);
+               optind++;
        }
 
-       /* 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 defined CONFIG_DPKG_DEB
+       unpack_ar_archive(archive_handle);
+#else
+       xread_all(archive_handle->src_fd, magic, 7);
+       if (strncmp(magic, "!<arch>", 7) != 0) {
+               error_msg_and_die("Invalid ar magic");
        }
+       archive_handle->offset += 7;
+
+       while (get_header_ar(archive_handle) == EXIT_SUCCESS);
+#endif
+
        return EXIT_SUCCESS;
 }