summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/tar.c9
-rw-r--r--tar.c9
2 files changed, 4 insertions, 14 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 9e1270c..f31859e 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -382,8 +382,6 @@ 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);
@@ -394,15 +392,12 @@ 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 '/') */
- 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) {
+ if (mkdir(header->name, header->mode) < 0 && errno != EEXIST) {
perror_msg("%s", header->name);
return FALSE;
}
+ fixUpPermissions(header);
return( TRUE);
}
diff --git a/tar.c b/tar.c
index 9e1270c..f31859e 100644
--- a/tar.c
+++ b/tar.c
@@ -382,8 +382,6 @@ 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);
@@ -394,15 +392,12 @@ 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 '/') */
- 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) {
+ if (mkdir(header->name, header->mode) < 0 && errno != EEXIST) {
perror_msg("%s", header->name);
return FALSE;
}
+ fixUpPermissions(header);
return( TRUE);
}