Fix the pwd and group functions. The bb_ stuff was a leftover from
[oweals/busybox.git] / tar.c
diff --git a/tar.c b/tar.c
index bf8f9b813e3f0abc329031d912b3e12eb898fe55..3082914550a32672d10dcd8ed4270092be31219e 100644 (file)
--- a/tar.c
+++ b/tar.c
@@ -6,7 +6,7 @@
  * 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)
  *
- * Copyright (C) 2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * Based in part in the tar implementation in sash
@@ -52,6 +52,9 @@
 #include <sys/sysmacros.h>
 #include <getopt.h>
 #include <fnmatch.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #ifdef BB_FEATURE_TAR_GZIP
 extern int unzip(int in, int out);
@@ -64,7 +67,7 @@ extern int gunzip_init();
 #define MINOR(dev) ((dev)&0xff)
 #endif
 
-#define NAME_SIZE      100
+enum { NAME_SIZE = 100 }; /* because gcc won't let me use 'static const int' */
 
 /* POSIX tar Header Block, from POSIX 1003.1-1990  */
 struct TarHeader
@@ -94,9 +97,9 @@ typedef struct TarHeader TarHeader;
 /* A few useful constants */
 #define TAR_MAGIC          "ustar"        /* ustar and a null */
 #define TAR_VERSION        "  "           /* Be compatable with GNU tar format */
-#define TAR_MAGIC_LEN       6
-#define TAR_VERSION_LEN     2
-#define TAR_BLOCK_SIZE      512
+static const int TAR_MAGIC_LEN = 6;
+static const int TAR_VERSION_LEN = 2;
+static const int TAR_BLOCK_SIZE = 512;
 
 /* A nice enum with all the possible tar file content types */
 enum TarFileType 
@@ -163,7 +166,7 @@ extern int tar_unzip_init(int tarFd)
 
        if (pipe(unzip_pipe)!=0)
                error_msg_and_die("pipe error\n");
-                       
+
        if ( (child_pid = fork()) == -1)
                error_msg_and_die("fork failure\n");
 
@@ -182,6 +185,13 @@ extern int tar_unzip_init(int tarFd)
 }
 #endif
 
+#if defined BB_FEATURE_TAR_EXCLUDE
+struct option longopts[] = {
+       { "exclude", 1, NULL, 'e' },
+       { NULL, 0, NULL, 0 }
+};
+#endif
+
 extern int tar_main(int argc, char **argv)
 {
        char** excludeList=NULL;
@@ -189,7 +199,6 @@ extern int tar_main(int argc, char **argv)
        const char *tarName="-";
 #if defined BB_FEATURE_TAR_EXCLUDE
        int excludeListSize=0;
-       char *excludeFileName ="-";
        FILE *fileList;
        char file[256];
 #endif
@@ -202,95 +211,84 @@ extern int tar_main(int argc, char **argv)
        int verboseFlag  = FALSE;
        int tostdoutFlag = FALSE;
        int status       = FALSE;
-       int firstOpt     = TRUE;
-       int stopIt;
+       int opt;
 
        if (argc <= 1)
                usage(tar_usage);
 
-       while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
-               firstOpt=FALSE;
-               stopIt=FALSE;
-               while (stopIt==FALSE && **argv) {
-                       switch (*((*argv)++)) {
-                               case 'c':
-                                       if (extractFlag == TRUE || listFlag == TRUE)
-                                               goto flagError;
-                                       createFlag = TRUE;
-                                       break;
-                               case 'x':
-                                       if (listFlag == TRUE || createFlag == TRUE)
-                                               goto flagError;
-                                       extractFlag = TRUE;
-                                       break;
-                               case 't':
-                                       if (extractFlag == TRUE || createFlag == TRUE)
-                                               goto flagError;
-                                       listFlag = TRUE;
-                                       break;
+       if (argv[1][0] != '-') {
+               char *tmp = xmalloc(strlen(argv[1]) + 2);
+               tmp[0] = '-';
+               strcpy(tmp + 1, argv[1]);
+               argv[1] = tmp;
+       }
+
+       while (
+#ifndef BB_FEATURE_TAR_EXCLUDE
+                       (opt = getopt(argc, argv, "cxtzvOf:"))
+#else
+                       (opt = getopt_long(argc, argv, "cxtzvOf:X:", longopts, NULL))
+#endif
+                       > 0) {
+               switch (opt) {
+                       case 'c':
+                               if (extractFlag == TRUE || listFlag == TRUE)
+                                       goto flagError;
+                               createFlag = TRUE;
+                               break;
+                       case 'x':
+                               if (listFlag == TRUE || createFlag == TRUE)
+                                       goto flagError;
+                               extractFlag = TRUE;
+                               break;
+                       case 't':
+                               if (extractFlag == TRUE || createFlag == TRUE)
+                                       goto flagError;
+                               listFlag = TRUE;
+                               break;
 #ifdef BB_FEATURE_TAR_GZIP
-                               case 'z':
-                                       unzipFlag = TRUE;
-                                       break;
+                       case 'z':
+                               unzipFlag = TRUE;
+                               break;
 #endif
-                               case 'v':
-                                       verboseFlag = TRUE;
-                                       break;
-                               case 'O':
-                                       tostdoutFlag = TRUE;
-                                       break;                                  
-                               case 'f':
-                                       if (*tarName != '-')
-                                               error_msg_and_die( "Only one 'f' option allowed\n");
-                                       tarName = *(++argv);
-                                       if (tarName == NULL)
-                                               error_msg_and_die( "Option requires an argument: No file specified\n");
-                                       stopIt=TRUE;
-                                       break;
+                       case 'v':
+                               verboseFlag = TRUE;
+                               break;
+                       case 'O':
+                               tostdoutFlag = TRUE;
+                               break;
+                       case 'f':
+                               if (*tarName != '-')
+                                       error_msg_and_die( "Only one 'f' option allowed\n");
+                               tarName = optarg;
+                               break;
 #if defined BB_FEATURE_TAR_EXCLUDE
-                               case 'e':
-                                       if (strcmp(*argv, "xclude")==0) {
-                                               excludeList=xrealloc( excludeList,
-                                                               sizeof(char *) * (excludeListSize+2));
-                                               excludeList[excludeListSize] = *(++argv);
-                                               if (excludeList[excludeListSize] == NULL)
-                                                       error_msg_and_die( "Option requires an argument: No file specified\n");
-                                               /* Tack a NULL onto the end of the list */
-                                               excludeList[++excludeListSize] = NULL;
-                                               stopIt=TRUE;
-                                               break;
-                                       }
-                               case 'X':
-                                       if (*excludeFileName != '-')
-                                               error_msg_and_die("Only one 'X' option allowed\n");
-                                       excludeFileName = *(++argv);
-                                       if (excludeFileName == NULL)
-                                               error_msg_and_die("Option requires an argument: No file specified\n");
-                                       fileList = fopen (excludeFileName, "r");
-                                       if (! fileList)
-                                               error_msg_and_die("Exclude file: file not found\n");
-                                       while (fgets(file, sizeof(file), fileList) != NULL) {
-                                               excludeList = xrealloc(excludeList,
-                                                               sizeof(char *) * (excludeListSize+2));
-                                               if (file[strlen(file)-1] == '\n')
-                                                       file[strlen(file)-1] = '\0';
-                                               excludeList[excludeListSize] = xstrdup(file);
-                                               /* Tack a NULL onto the end of the list */
-                                               excludeList[++excludeListSize] = NULL;
-                                       }
-                                       fclose(fileList);
-                                       stopIt=TRUE;
-                                       break;
+                       case 'e':
+                               excludeList=xrealloc( excludeList,
+                                               sizeof(char *) * (excludeListSize+2));
+                               excludeList[excludeListSize] = optarg;
+                               /* Tack a NULL onto the end of the list */
+                               excludeList[++excludeListSize] = NULL;
+                       case 'X':
+                               fileList = xfopen(optarg, "r");
+                               while (fgets(file, sizeof(file), fileList) != NULL) {
+                                       excludeList = xrealloc(excludeList,
+                                                       sizeof(char *) * (excludeListSize+2));
+                                       if (file[strlen(file)-1] == '\n')
+                                               file[strlen(file)-1] = '\0';
+                                       excludeList[excludeListSize] = xstrdup(file);
+                                       /* Tack a NULL onto the end of the list */
+                                       excludeList[++excludeListSize] = NULL;
+                               }
+                               fclose(fileList);
+                               break;
 #endif
-                               case '-':
-                                               break;
                                default:
                                        usage(tar_usage);
-                       }
                }
        }
 
-       /* 
+       /*
         * Do the correct type of action supplying the rest of the
         * command line arguments as the list of files to process.
         */
@@ -302,13 +300,13 @@ extern int tar_main(int argc, char **argv)
                if (unzipFlag==TRUE)
                        error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
 #endif
-               status = writeTarFile(tarName, verboseFlag, argv, excludeList);
+               status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
 #endif
        }
        if (listFlag == TRUE || extractFlag == TRUE) {
                int tarFd;
-               if (*argv)
-                       extractList = argv;
+               if (argv[optind])
+                       extractList = argv + optind;
                /* Open the tar file for reading.  */
                if (!strcmp(tarName, "-"))
                        tarFd = fileno(stdin);