Updates from both Vladimir and Larry

[oweals/busybox.git] / tar.c

diff --git a/tar.c b/tar.c
index 135bfd186a9d670b866aa27368e09dd76f0a0c95..282656fe766b6ece79e7f28fef775294144fff58 100644 (file)
--- 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);
 }
 
@@ -486,7 +490,7 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
                static int alreadyWarned=FALSE;
 
                while (*(header->name) == '/')
-                       ++*(header->name);
+                       header->name++;
 
                if (alreadyWarned == FALSE) {
                        error_msg("Removing leading '/' from member names");