Some more patchelttes from Larry Doolittle.

[oweals/busybox.git] / tar.c

diff --git a/tar.c b/tar.c
index c168564ca8b3751d9599e32ef0fc1962989576e5..9e1270cca10a27e888c3ee36ef5c12ebf859ad77 100644 (file)
--- a/tar.c
+++ b/tar.c
@@ -4,7 +4,7 @@
  *
  * Note, that as of BusyBox-0.43, tar has been completely rewritten from the
  * ground up.  It still has remnents of the old code lying about, but it is
- * very different now (i.e. cleaner, less global variables, etc)
+ * very different now (i.e., cleaner, less global variables, etc.)
  *
  * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
@@ -121,7 +121,7 @@ struct TarInfo
        gid_t            gid;            /* Numeric GID */
        size_t           size;           /* Size of file */
        time_t           mtime;          /* Last-modified time */
-       enum TarFileType type;           /* Regular, directory, link, etc */
+       enum TarFileType type;           /* Regular, directory, link, etc. */
        char *           linkname;       /* Name for symbolic and hard links */
        long             devmajor;       /* Major number for special device */
        long             devminor;       /* Minor number for special device */
@@ -303,7 +303,7 @@ static void
 fixUpPermissions(TarInfo *header)
 {
        struct utimbuf t;
-       /* Now set permissions etc for the new file */
+       /* Now set permissions etc. for the new file */
        chown(header->name, header->uid, header->gid);
        chmod(header->name, header->mode);
        /* Reset the time */
@@ -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);
 }
 
@@ -414,7 +418,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
                return( FALSE);
        }
 
-       /* Now set permissions etc for the new directory */
+       /* Now set permissions etc. for the new directory */
        fixUpPermissions(header);
        return( TRUE);
 }
@@ -467,7 +471,7 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
                }
        }
 
-       /* Now set permissions etc for the new directory */
+       /* Now set permissions etc. for the new directory */
        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");
@@ -595,7 +599,7 @@ static int readTarFile(int tarFd, int extractFlag, int listFlag,
                        }
                }
                if ( *(header.name) == '\0' )
-                               goto endgame;
+                       continue;
                header.tarFd = tarFd;
 
                /* Skip funky extra GNU headers that precede long files */
@@ -921,16 +925,12 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
                header.typeflag = LNKTYPE;
                strncpy(header.linkname, tbInfo->hlInfo->name, sizeof(header.linkname));
        } else if (S_ISLNK(statbuf->st_mode)) {
-               int link_size=0;
-               char buffer[BUFSIZ];
-               header.typeflag  = SYMTYPE;
-               link_size = readlink(real_name, buffer, sizeof(buffer) - 1);
-               if ( link_size < 0) {
-                       perror_msg("Error reading symlink '%s'", header.name);
+               char *lpath = xreadlink(real_name);
+               if (!lpath) /* Already printed err msg inside xreadlink() */
                        return ( FALSE);
-               }
-               buffer[link_size] = '\0';
-               strncpy(header.linkname, buffer, sizeof(header.linkname)); 
+               header.typeflag  = SYMTYPE;
+               strncpy(header.linkname, lpath, sizeof(header.linkname)); 
+               free(lpath);
        } else if (S_ISDIR(statbuf->st_mode)) {
                header.typeflag  = DIRTYPE;
                strncat(header.name, "/", sizeof(header.name)); 
@@ -952,7 +952,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
                return ( FALSE);
        }
 
-       /* Calculate and store the checksum (i.e. the sum of all of the bytes of
+       /* Calculate and store the checksum (i.e., the sum of all of the bytes of
         * the header).  The checksum field must be filled with blanks for the
         * calculation.  The checksum field is formatted differently from the
         * other fields: it has [6] digits, a null, then a space -- rather than