From c17b47e96944cbab5c9c05b6e3eccf6086b753de Mon Sep 17 00:00:00 2001
From: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Sun, 13 May 2001 15:39:30 +0000
Subject: Do not ever change permissions on existing directories, only on
directories we created while extracting a tarball. Fix based on bug report
and patch from Konstantin Boldyshev <konst@linuxassembly.org> -Erik
git-svn-id: svn://busybox.net/trunk/busybox@2632 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
tar.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'tar.c')
diff --git a/tar.c b/tar.c
index 135bfd186..6af16f4bd 100644
--- a/tar.c
+++ b/tar.c
@@ -382,6 +382,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
static int
tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
{
+ int result;
if (extractFlag==FALSE || tostdoutFlag==TRUE)
return( TRUE);
@@ -393,12 +394,15 @@ tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
/* make the final component, just in case it was
* omitted by create_path() (which will skip the
* directory if it doesn't have a terminating '/') */
- if (mkdir(header->name, header->mode) < 0 && errno != EEXIST) {
+ result = mkdir(header->name, header->mode);
+ /* Don't fix permissions on pre-existing directories */
+ if (result == 0) {
+ fixUpPermissions(header);
+ } else if (result < 0 && errno != EEXIST) {
perror_msg("%s", header->name);
return FALSE;
}
- fixUpPermissions(header);
return( TRUE);
}
--
cgit v1.2.3-55-g6feb