Added support for ignoring '-g' per GNU ls, thanks to David Vrabel

[oweals/busybox.git] / tar.c

diff --git a/tar.c b/tar.c
index 7d440f451c7c51ac426751100e8bc0c3a9976cd5..611bbd9a015271d52ec63829f639d5e6981aed3a 100644 (file)
--- a/tar.c
+++ b/tar.c
@@ -246,6 +246,9 @@ extern int tar_main(int argc, char **argv)
                                                break;
                                        }
 #endif
+                                       if (strcmp(*argv, "-help")==0) {
+                                               usage(tar_usage);
+                                       }
                                        break;
 
                                default:
@@ -300,11 +303,14 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
 
        /* Open the file to be written, if a file is supposed to be written */
        if (extractFlag==TRUE && tostdoutFlag==FALSE) {
-               if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, header->mode & ~S_IFMT)) < 0)
-                       errorMsg(io_error, header->name, strerror(errno)); 
                /* Create the path to the file, just in case it isn't there...
                 * This should not screw up path permissions or anything. */
                createPath(header->name, 0777);
+               if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, 
+                                               header->mode & ~S_IFMT)) < 0) {
+                       errorMsg(io_error, header->name, strerror(errno)); 
+                       return( FALSE);
+               }
        }
 
        /* Write out the file, if we are supposed to be doing that */
@@ -642,7 +648,8 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
                }
 
                /* Remove any clutter lying in our way */
-               unlink( header.name);
+               if (extractFlag == TRUE)        /* .. but only if we are extracting (as */
+                       unlink( header.name);   /* opposed to listing) (rob@sysgo.de)   */
 
                /* If we got here, we can be certain we have a legitimate 
                 * header to work with.  So work with it.  */
@@ -818,12 +825,15 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *st
 
        /* WARNING/NOTICE: I break Hard Links */
        if (S_ISLNK(statbuf->st_mode)) {
+               int link_size=0;
                char buffer[BUFSIZ];
                header.typeflag  = SYMTYPE;
-               if ( readlink(fileName, buffer, sizeof(buffer) - 1) < 0) {
+               link_size = readlink(fileName, buffer, sizeof(buffer) - 1);
+               if ( link_size < 0) {
                        errorMsg("Error reading symlink '%s': %s\n", header.name, strerror(errno));
                        return ( FALSE);
                }
+               buffer[link_size] = '\0';
                strncpy(header.linkname, buffer, sizeof(header.linkname)); 
        } else if (S_ISDIR(statbuf->st_mode)) {
                header.typeflag  = DIRTYPE;