Another update from Larry:

[oweals/busybox.git] / tar.c

diff --git a/tar.c b/tar.c
index fb8d84446a5369ad43d69a22db2c6d410579f285..eb085c770ded64efa645219ff971b72bdfa49285 100644 (file)
--- a/tar.c
+++ b/tar.c
@@ -51,16 +51,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#define bb_need_name_longer_than_foo
-#include "messages.c"
-
-#ifdef BB_FEATURE_TAR_GZIP
-extern int unzip(int in, int out);
-extern int gz_open(FILE *compressed_file, int *pid);
-extern void gz_close(int gunzip_pid);
-#endif
 
 /* Tar file constants  */
 #ifndef MAJOR
@@ -139,7 +129,7 @@ struct TarInfo
 typedef struct TarInfo TarInfo;
 
 /* Local procedures to restore files from a tar file.  */
-extern int readTarFile(int tarFd, int extractFlag, int listFlag, 
+static int readTarFile(int tarFd, int extractFlag, int listFlag, 
                int tostdoutFlag, int verboseFlag, char** extractList,
                char** excludeList);
 
@@ -482,26 +472,6 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
        return( TRUE);
 }
 
-/* Read an octal value in a field of the specified width, with optional
- * spaces on both sides of the number and with an optional null character
- * at the end.  Returns -1 on an illegal format.  */
-static long getOctal(const char *cp, int size)
-{
-       long val = 0;
-
-       for(;(size > 0) && (*cp == ' '); cp++, size--);
-       if ((size == 0) || !is_octal(*cp))
-               return -1;
-       for(; (size > 0) && is_octal(*cp); size--) {
-               val = val * 8 + *cp++ - '0';
-       }
-       for (;(size > 0) && (*cp == ' '); cp++, size--);
-       if ((size > 0) && *cp)
-               return -1;
-       return val;
-}
-
-
 /* Parse the tar header and fill in the nice struct with the details */
 static int
 readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
@@ -524,16 +494,16 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
                }
        }
 
-       header->mode  = getOctal(rawHeader->mode, sizeof(rawHeader->mode));
-       header->uid   =  getOctal(rawHeader->uid, sizeof(rawHeader->uid));
-       header->gid   =  getOctal(rawHeader->gid, sizeof(rawHeader->gid));
-       header->size  = getOctal(rawHeader->size, sizeof(rawHeader->size));
-       header->mtime = getOctal(rawHeader->mtime, sizeof(rawHeader->mtime));
-       chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum));
+       header->mode  = strtol(rawHeader->mode, NULL, 8);
+       header->uid   = strtol(rawHeader->uid, NULL, 8);
+       header->gid   = strtol(rawHeader->gid, NULL, 8);
+       header->size  = strtol(rawHeader->size, NULL, 8);
+       header->mtime = strtol(rawHeader->mtime, NULL, 8);
+       chksum = strtol(rawHeader->chksum, NULL, 8);
        header->type  = rawHeader->typeflag;
        header->linkname  = rawHeader->linkname;
-       header->devmajor  = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor));
-       header->devminor  = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor));
+       header->devmajor  = strtol(rawHeader->devmajor, NULL, 8);
+       header->devminor  = strtol(rawHeader->devminor, NULL, 8);
 
        /* Check the checksum */
        for (i = sizeof(*rawHeader); i-- != 0;) {
@@ -597,7 +567,7 @@ static int extract_file(char **extract_files, const char *file)
  * Read a tar file and extract or list the specified files within it.
  * If the list is empty than all files are extracted or listed.
  */
-extern int readTarFile(int tarFd, int extractFlag, int listFlag, 
+static int readTarFile(int tarFd, int extractFlag, int listFlag, 
                int tostdoutFlag, int verboseFlag, char** extractList,
                char** excludeList)
 {
@@ -625,7 +595,7 @@ extern 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 */
@@ -736,7 +706,7 @@ extern int readTarFile(int tarFd, int extractFlag, int listFlag,
                        case REGTYPE0:
                                /* If the name ends in a '/' then assume it is
                                 * supposed to be a directory, and fall through */
-                               if (header.name[strlen(header.name)-1] != '/') {
+                               if (!last_char_is(header.name,'/')) {
                                        if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE)
                                                errorFlag=TRUE;
                                        break;
@@ -951,16 +921,10 @@ 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];
+               char *lpath = xreadlink(real_name);
                header.typeflag  = SYMTYPE;
-               link_size = readlink(real_name, buffer, sizeof(buffer) - 1);
-               if ( link_size < 0) {
-                       perror_msg("Error reading symlink '%s'", header.name);
-                       return ( FALSE);
-               }
-               buffer[link_size] = '\0';
-               strncpy(header.linkname, buffer, sizeof(header.linkname)); 
+               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));