* 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
#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);
#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
/* 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
signal(SIGCHLD, child_died);
if (pipe(unzip_pipe)!=0)
- error_msg_and_die("pipe error\n");
-
+ error_msg_and_die("pipe error");
+
if ( (child_pid = fork()) == -1)
- error_msg_and_die("fork failure\n");
+ error_msg_and_die("fork failure");
if (child_pid==0) {
/* child process */
}
#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;
const char *tarName="-";
#if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0;
- char *excludeFileName ="-";
FILE *fileList;
char file[256];
#endif
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");
+ 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.
*/
if (createFlag == TRUE) {
#ifndef BB_FEATURE_TAR_CREATE
- error_msg_and_die( "This version of tar was not compiled with tar creation support.\n");
+ error_msg_and_die( "This version of tar was not compiled with tar creation support.");
#else
#ifdef BB_FEATURE_TAR_GZIP
if (unzipFlag==TRUE)
- error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
+ error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip");
#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);
return EXIT_FAILURE;
flagError:
- error_msg_and_die( "Exactly one of 'c', 'x' or 't' must be specified\n");
+ error_msg_and_die( "Exactly one of 'c', 'x' or 't' must be specified");
}
static void
}
if ( (readSize = full_read(header->tarFd, buffer, readSize)) <= 0 ) {
/* Tarball seems to have a problem */
- error_msg("Unexpected EOF in archive\n");
+ error_msg("Unexpected EOF in archive");
return( FALSE);
}
if ( readSize < writeSize )
/* Do not change permissions or date on symlink,
* since it changes the pointed to file instead. duh. */
#else
- error_msg("%s: Cannot create symlink to '%s': %s\n",
+ error_msg("%s: Cannot create symlink to '%s': %s",
header->name, header->linkname,
"symlinks not supported");
#endif
++*(header->name);
if (alreadyWarned == FALSE) {
- error_msg("Removing leading '/' from member names\n");
+ error_msg("Removing leading '/' from member names");
alreadyWarned = TRUE;
}
}
goto endgame;
} else {
errorFlag=TRUE;
- error_msg("Bad tar header, skipping\n");
+ error_msg("Bad tar header, skipping");
continue;
}
}
break;
#endif
default:
- error_msg("Unknown file type '%c' in tar file\n", header.type);
+ error_msg("Unknown file type '%c' in tar file", header.type);
close( tarFd);
return( FALSE);
}
return ( FALSE);
}
else if (errorFlag==TRUE) {
- error_msg( "Error exit delayed from previous errors\n");
+ error_msg( "Error exit delayed from previous errors");
return( FALSE);
} else
return( status);
close( tarFd);
if ( *(header.name) == '\0' ) {
if (errorFlag==TRUE)
- error_msg( "Error exit delayed from previous errors\n");
+ error_msg( "Error exit delayed from previous errors");
else
return( TRUE);
}
header.typeflag = REGTYPE;
putOctal(header.size, sizeof(header.size), statbuf->st_size);
} else {
- error_msg("%s: Unknown file type\n", real_name);
+ error_msg("%s: Unknown file type", real_name);
return ( FALSE);
}
/* It is against the rules to archive a socket */
if (S_ISSOCK(statbuf->st_mode)) {
- error_msg("%s: socket ignored\n", fileName);
+ error_msg("%s: socket ignored", fileName);
return( TRUE);
}
* the new tarball */
if (tbInfo->statBuf.st_dev == statbuf->st_dev &&
tbInfo->statBuf.st_ino == statbuf->st_ino) {
- error_msg("%s: file is the archive; skipping\n", fileName);
+ error_msg("%s: file is the archive; skipping", fileName);
return( TRUE);
}
while (header_name[0] == '/') {
static int alreadyWarned=FALSE;
if (alreadyWarned==FALSE) {
- error_msg("Removing leading '/' from member names\n");
+ error_msg("Removing leading '/' from member names");
alreadyWarned=TRUE;
}
header_name++;
/* open the file we want to archive, and make sure all is well */
if ((inputFileFd = open(fileName, O_RDONLY)) < 0) {
- error_msg("%s: Cannot open: %s\n", fileName, strerror(errno));
+ error_msg("%s: Cannot open: %s", fileName, strerror(errno));
return( FALSE);
}
/* Make sure there is at least one file to tar up. */
if (*argv == NULL)
- error_msg_and_die("Cowardly refusing to create an empty archive\n");
+ error_msg_and_die("Cowardly refusing to create an empty archive");
/* Open the tar file for writing. */
if (!strcmp(tarName, "-"))
/* Hang up the tools, close up shop, head home */
close(tarFd);
if (errorFlag == TRUE) {
- error_msg("Error exit delayed from previous errors\n");
+ error_msg("Error exit delayed from previous errors");
freeHardLinkInfo(&tbInfo.hlInfoHead);
return(FALSE);
}
projects / oweals / busybox.git / blobdiff