Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/archival/libunarchive/data_extract_all.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/archival/libunarchive/data_extract_all.c (modified) (7 diffs)

branches/2.2.5/mindi-busybox/archival/libunarchive/data_extract_all.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
- *  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.
- *
- *  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 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 <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <utime.h>
-#include <unistd.h>
-#include <stdlib.h>
 
 #include "libbb.h"
@@ -35 +14 @@
 
     if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
-        char *name = bb_xstrdup(file_header->name);
-        bb_make_directory (dirname(name), -1, FILEUTILS_RECUR);
+        char *name = xstrdup(file_header->name);
+        bb_make_directory(dirname(name), -1, FILEUTILS_RECUR);
         free(name);
     }
@@ -43 +22 @@
     if (archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) {
         /* Remove the existing entry if it exists */
-        if (((file_header->mode & S_IFMT) != S_IFDIR) && (unlink(file_header->name) == -1) && (errno != ENOENT)) {
-            bb_perror_msg_and_die("Couldnt remove old file");
+        if (((file_header->mode & S_IFMT) != S_IFDIR)
+         && (unlink(file_header->name) == -1)
+         && (errno != ENOENT)
+        ) {
+            bb_perror_msg_and_die("cannot remove old file %s",
+                    file_header->name);
         }
     }
@@ -52 +35 @@
         if (lstat(file_header->name, &statbuf) == -1) {
             if (errno != ENOENT) {
-                bb_perror_msg_and_die("Couldnt stat old file");
+                bb_perror_msg_and_die("cannot stat old file");
             }
         }
         else if (statbuf.st_mtime <= file_header->mtime) {
             if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                bb_error_msg("%s not created: newer or same age file exists", file_header->name);
+                bb_error_msg("%s not created: newer or "
+                    "same age file exists", file_header->name);
             }
             data_skip(archive_handle);
@@ -63 +47 @@
         }
         else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
-            bb_perror_msg_and_die("Couldnt remove old file %s", file_header->name);
+            bb_perror_msg_and_die("cannot remove old file %s",
+                    file_header->name);
         }
     }
@@ -69 +54 @@
     /* Handle hard links separately
      * We identified hard links as regular files of size 0 with a symlink */
-    if (S_ISREG(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
+    if (S_ISREG(file_header->mode) && (file_header->link_target)
+     && (file_header->size == 0)
+    ) {
         /* hard link */
-        res = link(file_header->link_name, file_header->name);
+        res = link(file_header->link_target, file_header->name);
         if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-            bb_perror_msg("Couldnt create hard link");
+            bb_perror_msg("cannot create %slink "
+                    "from %s to %s", "hard",
+                    file_header->name,
+                    file_header->link_target);
         }
     } else {
         /* Create the filesystem entry */
-        switch(file_header->mode & S_IFMT) {
-            case S_IFREG: {
-                /* Regular file */
-                dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
-                bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
-                close(dst_fd);
-                break;
-                }
-            case S_IFDIR:
-                res = mkdir(file_header->name, file_header->mode);
-                if ((errno != EISDIR) && (res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                    bb_perror_msg("extract_archive: %s", file_header->name);
-                }
-                break;
-            case S_IFLNK:
-                /* Symlink */
-                res = symlink(file_header->link_name, file_header->name);
-                if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                    bb_perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
-                }
-                break;
-            case S_IFSOCK:
-            case S_IFBLK:
-            case S_IFCHR:
-            case S_IFIFO:
-                res = mknod(file_header->name, file_header->mode, file_header->device);
-                if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                    bb_perror_msg("Cannot create node %s", file_header->name);
-                }
-                break;
-            default:
-                bb_error_msg_and_die("Unrecognised file type");
+        switch (file_header->mode & S_IFMT) {
+        case S_IFREG: {
+            /* Regular file */
+            dst_fd = xopen3(file_header->name, O_WRONLY | O_CREAT | O_EXCL,
+                            file_header->mode);
+            bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
+            close(dst_fd);
+            break;
+        }
+        case S_IFDIR:
+            res = mkdir(file_header->name, file_header->mode);
+            if ((res == -1) && (errno != EISDIR)
+             && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)
+            ) {
+                bb_perror_msg("cannot make dir %s", file_header->name);
+            }
+            break;
+        case S_IFLNK:
+            /* Symlink */
+            res = symlink(file_header->link_target, file_header->name);
+            if ((res == -1)
+             && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)
+            ) {
+                bb_perror_msg("cannot create %slink "
+                    "from %s to %s", "sym",
+                    file_header->name,
+                    file_header->link_target);
+            }
+            break;
+        case S_IFSOCK:
+        case S_IFBLK:
+        case S_IFCHR:
+        case S_IFIFO:
+            res = mknod(file_header->name, file_header->mode, file_header->device);
+            if ((res == -1)
+             && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)
+            ) {
+                bb_perror_msg("cannot create node %s", file_header->name);
+            }
+            break;
+        default:
+            bb_error_msg_and_die("unrecognized file type");
         }
     }
@@ -115 +115 @@
         lchown(file_header->name, file_header->uid, file_header->gid);
     }
-    if (!(archive_handle->flags & ARCHIVE_NOPRESERVE_PERM) &&
-         (file_header->mode & S_IFMT) != S_IFLNK)
-    {
-        chmod(file_header->name, file_header->mode);
-    }
-
-    if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) {
-        struct utimbuf t;
-        t.actime = t.modtime = file_header->mtime;
-        utime(file_header->name, &t);
+    if ((file_header->mode & S_IFMT) != S_IFLNK) {
+        /* uclibc has no lchmod, glibc is even stranger -
+         * it has lchmod which seems to do nothing!
+         * so we use chmod... */
+        if (!(archive_handle->flags & ARCHIVE_NOPRESERVE_PERM)) {
+            chmod(file_header->name, file_header->mode);
+        }
+        /* same for utime */
+        if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) {
+            struct utimbuf t;
+            t.actime = t.modtime = file_header->mtime;
+            utime(file_header->name, &t);
+        }
     }
 }