diff options
| author | Eric Andersen | 2001-05-13 15:39:30 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-05-13 15:39:30 +0000 |
| commit | a17b3631fe866ba84f2be753e28b4ac5cac45341 (patch) | |
| tree | 290ce540a96269c74ffc1a501dabc1789547e676 | |
| parent | 95a349f427158f1e99bfd1d5534963d9cb55860d (diff) | |
| download | busybox-a17b3631fe866ba84f2be753e28b4ac5cac45341.zip busybox-a17b3631fe866ba84f2be753e28b4ac5cac45341.tar.gz | |
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
| -rw-r--r-- | archival/tar.c | 8 | ||||
| -rw-r--r-- | tar.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/archival/tar.c b/archival/tar.c index 135bfd1..6af16f4 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); } @@ -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); } |