#include <sys/types.h>
#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
if (pipe(unzip_pipe)!=0)
error_msg_and_die("pipe error\n");
-
+
if ( (child_pid = fork()) == -1)
error_msg_and_die("fork failure\n");
if (child_pid==0) {
/* child process */
+ close(unzip_pipe[0]);
gunzip_init();
unzip(tarFd, unzip_pipe[1]);
exit(EXIT_SUCCESS);
}
- else
+ else {
/* return fd of uncompressed data to parent process */
+ close(unzip_pipe[1]);
return(unzip_pipe[0]);
+ }
}
#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\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");
- /* Remove leading "/"s */
- while (*excludeList[excludeListSize] =='/')
- excludeList[excludeListSize]++;
- /* 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);
- /* Remove leading "/"s */
- while (*excludeList[excludeListSize] == '/')
- excludeList[excludeListSize]++;
- /* 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 (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);
/* 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) {
- fixUpPermissions(header);
+ if (mkdir(header->name, header->mode) < 0 && errno != EEXIST) {
+ perror_msg("%s", header->name);
+ return FALSE;
}
+
+ fixUpPermissions(header);
return( TRUE);
}
return( FALSE);
}
+int exclude_file(char **excluded_files, const char *file)
+{
+ int i;
+
+ if (excluded_files == NULL)
+ return 0;
+
+ for (i = 0; excluded_files[i] != NULL; i++) {
+ if (excluded_files[i][0] == '/') {
+ if (fnmatch(excluded_files[i], file,
+ FNM_PATHNAME | FNM_LEADING_DIR) == 0)
+ return 1;
+ } else {
+ const char *p;
+
+ for (p = file; p[0] != '\0'; p++) {
+ if ((p == file || p[-1] == '/') && p[0] != '/' &&
+ fnmatch(excluded_files[i], p,
+ FNM_PATHNAME | FNM_LEADING_DIR) == 0)
+ return 1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+int extract_file(char **extract_files, const char *file)
+{
+ int i;
+
+ if (extract_files == NULL)
+ return 1;
+
+ for (i = 0; extract_files[i] != NULL; i++) {
+ if (fnmatch(extract_files[i], file, FNM_LEADING_DIR) == 0)
+ return 1;
+ }
+
+ return 0;
+}
/*
* Read a tar file and extract or list the specified files within it.
int skipNextHeaderFlag=FALSE;
TarHeader rawHeader;
TarInfo header;
- char** tmpList;
/* Set the umask for this process so it doesn't
* screw up permission setting for us later. */
}
#if defined BB_FEATURE_TAR_EXCLUDE
- {
- int skipFlag=FALSE;
- /* Check for excluded files.... */
- for (tmpList=excludeList; tmpList && *tmpList; tmpList++) {
- /* Do some extra hoop jumping for when directory names
- * end in '/' but the entry in tmpList doesn't */
- if (strncmp( *tmpList, header.name, strlen(*tmpList))==0 || (
- header.name[strlen(header.name)-1]=='/'
- && strncmp( *tmpList, header.name,
- MIN(strlen(header.name)-1, strlen(*tmpList)))==0)) {
- /* If it is a regular file, pretend to extract it with
- * the extractFlag set to FALSE, so the junk in the tarball
- * is properly skipped over */
- if ( header.type==REGTYPE || header.type==REGTYPE0 ) {
- if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
- errorFlag = TRUE;
- }
- skipFlag=TRUE;
- break;
- }
- }
+ if (exclude_file(excludeList, header.name)) {
/* There are not the droids you're looking for, move along */
- if (skipFlag==TRUE)
- continue;
+ /* If it is a regular file, pretend to extract it with
+ * the extractFlag set to FALSE, so the junk in the tarball
+ * is properly skipped over */
+ if ( header.type==REGTYPE || header.type==REGTYPE0 ) {
+ if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
+ errorFlag = TRUE;
+ }
+ continue;
}
#endif
- if (extractList != NULL) {
- int skipFlag = TRUE;
- for (tmpList = extractList; *tmpList != NULL; tmpList++) {
- if (strncmp( *tmpList, header.name, strlen(*tmpList))==0 || (
- header.name[strlen(header.name)-1]=='/'
- && strncmp( *tmpList, header.name,
- MIN(strlen(header.name)-1, strlen(*tmpList)))==0)) {
- /* If it is a regular file, pretend to extract it with
- * the extractFlag set to FALSE, so the junk in the tarball
- * is properly skipped over */
- skipFlag = FALSE;
- memmove(extractList+1, extractList,
- sizeof(*extractList)*(tmpList-extractList));
- extractList++;
- break;
- }
- }
+
+ if (!extract_file(extractList, header.name)) {
/* There are not the droids you're looking for, move along */
- if (skipFlag == TRUE) {
- if ( header.type==REGTYPE || header.type==REGTYPE0 )
- if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
- errorFlag = TRUE;
- continue;
+ /* If it is a regular file, pretend to extract it with
+ * the extractFlag set to FALSE, so the junk in the tarball
+ * is properly skipped over */
+ if ( header.type==REGTYPE || header.type==REGTYPE0 ) {
+ if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
+ errorFlag = TRUE;
}
+ continue;
}
if (listFlag == TRUE) {
/* Stuff to do when we are done */
endgame:
close( tarFd);
- if (extractList != NULL) {
- for (; *extractList != NULL; extractList++) {
- error_msg("%s: Not found in archive\n", *extractList);
- errorFlag = TRUE;
- }
- }
if ( *(header.name) == '\0' ) {
if (errorFlag==TRUE)
error_msg( "Error exit delayed from previous errors\n");
{
struct TarBallInfo *tbInfo = (struct TarBallInfo *)userData;
const char *header_name;
-#if defined BB_FEATURE_TAR_EXCLUDE
- char** tmpList;
-#endif
/*
** Check to see if we are dealing with a hard link.
return TRUE;
#if defined BB_FEATURE_TAR_EXCLUDE
- /* Check for excluded files.... */
- for (tmpList=tbInfo->excludeList; tmpList && *tmpList; tmpList++) {
- /* Do some extra hoop jumping for when directory names
- * end in '/' but the entry in tmpList doesn't */
- if (strncmp( *tmpList, header_name, strlen(*tmpList))==0 || (
- fileName[strlen(fileName)-1]=='/'
- && strncmp( *tmpList, fileName,
- MIN(strlen(fileName)-1, strlen(*tmpList)))==0)) {
- return SKIP;
- }
+ if (exclude_file(tbInfo->excludeList, header_name)) {
+ return SKIP;
}
#endif