From a17b3631fe866ba84f2be753e28b4ac5cac45341 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sun, 13 May 2001 15:39:30 +0000 Subject: [PATCH] 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 -Erik --- archival/tar.c | 8 ++++++-- tar.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/archival/tar.c b/archival/tar.c index 135bfd186..6af16f4bd 100644 --- a/archival/tar.c +++ b/archival/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); } 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); }