*/
-#include "internal.h"
+#include "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_io_error
-#define bb_need_name_longer_then_foo
+#define bb_need_name_longer_than_foo
#include "messages.c"
#include <stdio.h>
#include <dirent.h>
#ifdef BB_FEATURE_TAR_CREATE
/* Local procedures to save files into a tar file. */
-static int writeTarFile(const char* tarName, int tostdoutFlag,
- int verboseFlag, int argc, char **argv, char** excludeList);
+static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
+ char** excludeList);
#endif
extern int tar_main(int argc, char **argv)
if (argc <= 1)
usage(tar_usage);
- /* do normal option parsing */
- while (--argc > 0 && ((*argv && **(++argv) == '-') ||
- (firstOpt==TRUE && strspn(*argv, "-cxt") ))) {
+ while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
firstOpt=FALSE;
stopIt=FALSE;
- while (stopIt==FALSE && *argv && **argv) {
- switch (**argv) {
+ while (stopIt==FALSE && **argv) {
+ switch (*((*argv)++)) {
case 'c':
if (extractFlag == TRUE || listFlag == TRUE)
goto flagError;
break;
case 'O':
tostdoutFlag = TRUE;
- tarName = "-";
break;
case 'f':
- if (--argc == 0) {
- fatalError( "Option requires an argument: No file specified\n");
- }
if (*tarName != '-')
fatalError( "Only one 'f' option allowed\n");
tarName = *(++argv);
if (tarName == NULL)
fatalError( "Option requires an argument: No file specified\n");
- if (!strcmp(tarName, "-") && createFlag == TRUE)
- tostdoutFlag = TRUE;
stopIt=TRUE;
break;
#if defined BB_FEATURE_TAR_EXCLUDE
case 'e':
- if (strcmp(*argv, "-exclude")==0) {
- if (--argc == 0) {
- fatalError( "Option requires an argument: No file specified\n");
- }
+ if (strcmp(*argv, "exclude")==0) {
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv);
+ if (excludeList[excludeListSize] == NULL)
+ fatalError( "Option requires an argument: No file specified\n");
/* Remove leading "/"s */
if (*excludeList[excludeListSize] =='/')
excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
default:
usage(tar_usage);
}
- ++(*argv);
}
}
#ifndef BB_FEATURE_TAR_CREATE
fatalError( "This version of tar was not compiled with tar creation support.\n");
#else
- exit(writeTarFile(tarName, tostdoutFlag, verboseFlag, argc, argv, excludeList));
+ exit(writeTarFile(tarName, verboseFlag, argv, excludeList));
#endif
}
if (listFlag == TRUE || extractFlag == TRUE) {
- exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, verboseFlag, &argv[optind], excludeList));
+ exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag,
+ verboseFlag, argv, excludeList));
}
flagError:
}
if ( skipNextHeaderFlag == TRUE ) {
skipNextHeaderFlag=FALSE;
- errorMsg(name_longer_then_foo, NAME_SIZE);
+ errorMsg(name_longer_than_foo, NAME_SIZE);
tarExtractRegularFile(&header, FALSE, FALSE);
continue;
}
}
if (strlen(fileName) >= NAME_SIZE) {
- errorMsg(name_longer_then_foo, NAME_SIZE);
+ errorMsg(name_longer_than_foo, NAME_SIZE);
return ( TRUE);
}
return( TRUE);
}
-static int writeTarFile(const char* tarName, int tostdoutFlag,
- int verboseFlag, int argc, char **argv, char** excludeList)
+static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
+ char** excludeList)
{
int tarFd=-1;
int errorFlag=FALSE;
tbInfo.verboseFlag = verboseFlag;
/* Make sure there is at least one file to tar up. */
- if (argc <= 0)
+ if (*argv == NULL)
fatalError("Cowardly refusing to create an empty archive\n");
/* Open the tar file for writing. */
- if (tostdoutFlag == TRUE)
+ if (!strcmp(tarName, "-"))
tbInfo.tarFd = fileno(stdout);
else
tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644);
umask(0);
/* Read the directory/files and iterate over them one at a time */
- while (argc-- > 0) {
+ while (*argv != NULL) {
if (recursiveAction(*argv++, TRUE, FALSE, FALSE,
writeFileToTarball, writeFileToTarball,
(void*) &tbInfo) == FALSE) {
}
/* To be pedantically correct, we would check if the tarball
- * is smaller then 20 tar blocks, and pad it if it was smaller,
+ * is smaller than 20 tar blocks, and pad it if it was smaller,
* but that isn't necessary for GNU tar interoperability, and
* so is considered a waste of space */