From daf58ef61a5f78fa54958c0f7a53d13d792e0bb9 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 4 Aug 2006 17:26:58 +0000 Subject: [PATCH] Use xopen3() instead of an after-the-fact chown. --- archival/libunarchive/data_extract_all.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index 5d1ec302a..c8d162bce 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c @@ -58,7 +58,8 @@ void data_extract_all(archive_handle_t *archive_handle) switch(file_header->mode & S_IFMT) { case S_IFREG: { /* Regular file */ - dst_fd = 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; @@ -93,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; -- 2.25.1