removed a lot of trailing \n in bb_msg() calls. It is added

[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 25fdc060064b9d9f4f62bc69ee3037a1bb76bf17..bc766c6aafdf0bd8d0ed3c05259db51887e7b0b2 100644 (file)
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -1,25 +1,11 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+/* vi: set sw=4 ts=4: */
+/* Copyright 2002 Laurence Anderson
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 typedef struct hardlinks_s {
        file_header_t *entry;
@@ -27,7 +13,7 @@ typedef struct hardlinks_s {
        struct hardlinks_s *next;
 } hardlinks_t;
 
-extern char get_header_cpio(archive_handle_t *archive_handle)
+char get_header_cpio(archive_handle_t *archive_handle)
 {
        static hardlinks_t *saved_hardlinks = NULL;
        static unsigned short pending_hardlinks = 0;
@@ -36,7 +22,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        int namesize;
        char dummy[16];
        int major, minor, nlink, inode;
-       
+
        if (pending_hardlinks) { /* Deal with any pending hardlinks */
                hardlinks_t *tmp;
                hardlinks_t *oldtmp;
@@ -45,7 +31,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                oldtmp = NULL;
 
                while (tmp) {
-                       bb_error_msg_and_die("need to fix this\n");
+                       bb_error_msg_and_die("need to fix this");
                        if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
                                file_header = tmp->entry;
                                if (oldtmp) {
@@ -65,7 +51,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        /* There can be padding before archive header */
        data_align(archive_handle, 4);
 
-       if (archive_xread_all_eof(archive_handle, cpio_header, 110) == 0) {
+       if (archive_xread_all_eof(archive_handle, (unsigned char*)cpio_header, 110) == 0) {
                return(EXIT_FAILURE);
        }
        archive_handle->offset += 110;
@@ -77,16 +63,16 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        {
            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, 
+                   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 */
-       file_header->name[namesize] = '\0';
+       file_header->name = (char *) xzalloc(namesize + 1);
+       /* Read in filename */
+       xread(archive_handle->src_fd, file_header->name, namesize);
        archive_handle->offset += namesize;
 
        /* Update offset amount and skip padding before file contents */
@@ -112,11 +98,12 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
        }
 
        if (S_ISLNK(file_header->mode)) {
-               file_header->link_name = (char *) xmalloc(file_header->size + 1);
-               archive_xread_all(archive_handle, file_header->link_name, file_header->size);
-               file_header->link_name[file_header->size] = '\0';
+               file_header->link_name = (char *) xzalloc(file_header->size + 1);
+               xread(archive_handle->src_fd, file_header->link_name, file_header->size);
                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 */
@@ -131,7 +118,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                        pending_hardlinks = 1;
                        while (tmp) {
                                if (tmp->inode == inode) {
-                                       tmp->entry->link_name = bb_xstrdup(file_header->name);
+                                       tmp->entry->link_name = xstrdup(file_header->name);
                                        nlink--;
                                }
                                tmp = tmp->next;
@@ -141,15 +128,18 @@ extern char get_header_cpio(archive_handle_t *archive_handle)
                        }
                }
        }
-       file_header->device = (major << 8) | minor;
+       file_header->device = makedev(major, minor);
 
        if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
                archive_handle->action_data(archive_handle);
                archive_handle->action_header(archive_handle->file_header);
        } else {
-               data_skip(archive_handle);                      
+               data_skip(archive_handle);
        }
 
        archive_handle->offset += file_header->size;
+
+       free(file_header->link_name);
+
        return (EXIT_SUCCESS);
 }