silly switch style fix

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

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 6337e0c85b806772dc6c45f013d6d75e475f9012..b1c66a4a22f2b71067d1e8b6c562bfb0099454b2 100644 (file)
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -3,16 +3,6 @@
  * 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"
 #include "unarchive.h"
 
@@ -23,7 +13,7 @@ void data_extract_all(archive_handle_t *archive_handle)
        int res;
 
        if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
-               char *name = bb_xstrdup(file_header->name);
+               char *name = xstrdup(file_header->name);
                bb_make_directory (dirname(name), -1, FILEUTILS_RECUR);
                free(name);
        }
@@ -65,10 +55,11 @@ void data_extract_all(archive_handle_t *archive_handle)
                }
        } else {
                /* Create the filesystem entry */
-               switch(file_header->mode & S_IFMT) {
+               switch (file_header->mode & S_IFMT) {
                        case S_IFREG: {
                                /* Regular file */
-                               dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
+                               dst_fd = xopen3(file_header->name, O_WRONLY | O_CREAT | O_EXCL,
+                                                               file_header->mode);
                                bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
                                close(dst_fd);
                                break;
@@ -103,11 +94,6 @@ void data_extract_all(archive_handle_t *archive_handle)
        if (!(archive_handle->flags & ARCHIVE_NOPRESERVE_OWN)) {
                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;