Patch from Aurelien Jacobs to add unlzma. (A new decompression type,

[oweals/busybox.git] / archival / libunarchive / get_header_cpio.c

diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index 87e97158829800b12045b9e19dad53012a8bbfdc..11925c4e3e2b648aeab22734af6c1f50ced79328 100644 (file)
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/sysmacros.h>     /* major() and minor() */
 #include "unarchive.h"
 #include "libbb.h"
 
@@ -36,8 +37,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        int namesize;
        char dummy[16];
        int major, minor, nlink, inode;
-       char extract_flag;
-       
+
        if (pending_hardlinks) { /* Deal with any pending hardlinks */
                hardlinks_t *tmp;
                hardlinks_t *oldtmp;
@@ -46,7 +46,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                oldtmp = NULL;
 
                while (tmp) {
-                       error_msg_and_die("need to fix this\n");
+                       bb_error_msg_and_die("need to fix this\n");
                        if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
                                file_header = tmp->entry;
                                if (oldtmp) {
@@ -71,25 +71,19 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        }
        archive_handle->offset += 110;
 
-       if (strncmp(&cpio_header[0], "07070", 5) != 0) {
-               printf("cpio header is %x-%x-%x-%x-%x\n",
-                       cpio_header[0],
-                       cpio_header[1],
-                       cpio_header[2],
-                       cpio_header[3],
-                       cpio_header[4]);
-               error_msg_and_die("Unsupported cpio format");
-       }
-               
-       if ((cpio_header[5] != '1') && (cpio_header[5] != '2')) {
-               error_msg_and_die("Unsupported cpio format, use newc or crc");
+       if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) {
+               bb_error_msg_and_die("Unsupported cpio format, use newc or crc");
        }
 
-       sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
-               dummy, &inode, (unsigned int*)&file_header->mode, 
-               (unsigned int*)&file_header->uid, (unsigned int*)&file_header->gid,
-               &nlink, &file_header->mtime, &file_header->size,
-               dummy, &major, &minor, &namesize, dummy);
+       {
+           unsigned long tmpsize;
+           sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
+                   dummy, &inode, (unsigned int*)&file_header->mode,
+                   (unsigned int*)&file_header->uid, (unsigned int*)&file_header->gid,
+                   &nlink, &file_header->mtime, &tmpsize,
+                   dummy, &major, &minor, &namesize, dummy);
+           file_header->size = tmpsize;
+       }
 
        file_header->name = (char *) xmalloc(namesize + 1);
        archive_xread_all(archive_handle, file_header->name, namesize); /* Read in filename */
@@ -105,7 +99,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                        hardlinks_t *tmp = saved_hardlinks;
                        hardlinks_t *oldtmp = NULL;
                        while (tmp) {
-                               error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
+                               bb_error_msg("%s not created: cannot resolve hardlink", tmp->entry->name);
                                oldtmp = tmp;
                                tmp = tmp->next;
                                free (oldtmp->entry->name);
@@ -124,6 +118,8 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                file_header->link_name[file_header->size] = '\0';
                archive_handle->offset += file_header->size;
                file_header->size = 0; /* Stop possible seeks in future */
+       } else {
+               file_header->link_name = NULL;
        }
        if (nlink > 1 && !S_ISDIR(file_header->mode)) {
                if (file_header->size == 0) { /* Put file on a linked list for later */
@@ -138,48 +134,28 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                        pending_hardlinks = 1;
                        while (tmp) {
                                if (tmp->inode == inode) {
-                                       tmp->entry->link_name = xstrdup(file_header->name);
+                                       tmp->entry->link_name = bb_xstrdup(file_header->name);
                                        nlink--;
                                }
                                tmp = tmp->next;
                        }
                        if (nlink > 1) {
-                               error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
+                               bb_error_msg("error resolving hardlink: did you create the archive with GNU cpio 2.0-2.2?");
                        }
                }
        }
-       file_header->device = (major << 8) | minor;
+       file_header->device = makedev(major, minor);
 
-       extract_flag = FALSE;
        if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
-               struct stat statbuf;
-
-               extract_flag = TRUE;
-
-               /* Check if the file already exists */
-               if (lstat (file_header->name, &statbuf) == 0) {
-                       if ((archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) || (statbuf.st_mtime < file_header->mtime)) {
-                               /* Remove file if flag set or its older than the file to be extracted */
-                               if (unlink(file_header->name) == -1) {
-                                       perror_msg_and_die("Couldnt remove old file");
-                               }
-                       } else {
-                               if (! archive_handle->flags & ARCHIVE_EXTRACT_QUIET) {
-                                       error_msg("%s not created: newer or same age file exists", file_header->name);
-                               }
-                               extract_flag = FALSE;
-                       }
-               }
-               archive_handle->action_header(file_header);
-       }
-
-       archive_handle->action_header(file_header);
-       if (extract_flag) {
                archive_handle->action_data(archive_handle);
+               archive_handle->action_header(archive_handle->file_header);
        } else {
                data_skip(archive_handle);
        }
+
        archive_handle->offset += file_header->size;
+
+       free(file_header->link_name);
+
        return (EXIT_SUCCESS);
 }
-