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 588b081a530b340215ff48ce86e6be46410669f3..b1c66a4a22f2b71067d1e8b6c562bfb0099454b2 100644 (file)
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -1,29 +1,8 @@
+/* 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"
 #include "unarchive.h"
 
@@ -34,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);
        }
@@ -76,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;
@@ -114,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;