*
* Note, that as of BusyBox-0.43, tar has been completely rewritten from the
* 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)
+ * 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 "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#define bb_need_name_longer_than_foo
-#include "messages.c"
#include <stdio.h>
#include <dirent.h>
#include <errno.h>
#include <sys/sysmacros.h>
#include <getopt.h>
#include <fnmatch.h>
-
-#ifdef BB_FEATURE_TAR_GZIP
-extern int unzip(int in, int out);
-extern int gunzip_init();
-#endif
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
/* Tar file constants */
#ifndef MAJOR
gid_t gid; /* Numeric GID */
size_t size; /* Size of file */
time_t mtime; /* Last-modified time */
- enum TarFileType type; /* Regular, directory, link, etc */
+ enum TarFileType type; /* Regular, directory, link, etc. */
char * linkname; /* Name for symbolic and hard links */
long devmajor; /* Major number for special device */
long devminor; /* Minor number for special device */
typedef struct TarInfo TarInfo;
/* Local procedures to restore files from a tar file. */
-extern int readTarFile(int tarFd, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList);
char** excludeList);
#endif
-#ifdef BB_FEATURE_TAR_GZIP
-/* Signal handler for when child gzip process dies... */
-void child_died()
-{
- fflush(stdout);
- fflush(stderr);
- exit(EXIT_FAILURE);
-}
-
-extern int tar_unzip_init(int tarFd)
-{
- int child_pid;
- static int unzip_pipe[2];
- /* Cope if child dies... Otherwise we block forever in read()... */
- signal(SIGCHLD, child_died);
-
- 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 {
- /* 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[] = {
+static struct option longopts[] = {
{ "exclude", 1, NULL, 'e' },
{ NULL, 0, NULL, 0 }
};
char** excludeList=NULL;
char** extractList=NULL;
const char *tarName="-";
+ const char *cwd=NULL;
#if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0;
FILE *fileList;
char file[256];
#endif
#if defined BB_FEATURE_TAR_GZIP
+ FILE *comp_file = NULL;
int unzipFlag = FALSE;
#endif
int listFlag = FALSE;
int tostdoutFlag = FALSE;
int status = FALSE;
int opt;
+ pid_t pid;
if (argc <= 1)
- usage(tar_usage);
+ show_usage();
if (argv[1][0] != '-') {
char *tmp = xmalloc(strlen(argv[1]) + 2);
while (
#ifndef BB_FEATURE_TAR_EXCLUDE
- (opt = getopt(argc, argv, "cxtzvOf:"))
+ (opt = getopt(argc, argv, "cxtzvOf:pC:"))
#else
- (opt = getopt_long(argc, argv, "cxtzvOf:X:", longopts, NULL))
+ (opt = getopt_long(argc, argv, "cxtzvOf:X:pC:", longopts, NULL))
#endif
> 0) {
switch (opt) {
break;
case 'f':
if (*tarName != '-')
- error_msg_and_die( "Only one 'f' option allowed\n");
+ error_msg_and_die( "Only one 'f' option allowed");
tarName = optarg;
break;
#if defined BB_FEATURE_TAR_EXCLUDE
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';
+ chomp(file);
excludeList[excludeListSize] = xstrdup(file);
/* Tack a NULL onto the end of the list */
excludeList[++excludeListSize] = NULL;
fclose(fileList);
break;
#endif
- default:
- usage(tar_usage);
+ case 'p':
+ break;
+ case 'C':
+ cwd = xgetcwd((char *)cwd);
+ if (chdir(optarg)) {
+ printf("cd: %s: %s\n", optarg, strerror(errno));
+ return EXIT_FAILURE;
+ }
+ break;
+ default:
+ show_usage();
}
}
*/
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 + optind, excludeList);
#endif
#ifdef BB_FEATURE_TAR_GZIP
/* unzip tarFd in a seperate process */
- if (unzipFlag == TRUE)
- tarFd = tar_unzip_init(tarFd);
+ if (unzipFlag == TRUE) {
+ comp_file = fdopen(tarFd, "r");
+
+ /* set the buffer size */
+ setvbuf(comp_file, NULL, _IOFBF, 0x8000);
+
+ if ((tarFd = fileno(gz_open(comp_file, &pid))) == EXIT_FAILURE) {
+ error_msg_and_die("Couldnt unzip file");
+ }
+ }
#endif
status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag,
verboseFlag, extractList, excludeList);
+ close(tarFd);
+#ifdef BB_FEATURE_TAR_GZIP
+ if (unzipFlag == TRUE) {
+ gz_close(pid);
+ fclose(comp_file);
+ }
+#endif
}
+ if (cwd)
+ chdir(cwd);
if (status == TRUE)
return EXIT_SUCCESS;
else
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
fixUpPermissions(TarInfo *header)
{
struct utimbuf t;
- /* Now set permissions etc for the new file */
+ /* Now set permissions etc. for the new file */
chown(header->name, header->uid, header->gid);
chmod(header->name, header->mode);
/* Reset the time */
size_t writeSize;
size_t readSize;
size_t actualWriteSz;
- char buffer[BUFSIZ];
+ char buffer[20 * TAR_BLOCK_SIZE];
size_t size = header->size;
int outFd=fileno(stdout);
if (extractFlag==TRUE && tostdoutFlag==FALSE) {
/* Create the path to the file, just in case it isn't there...
* This should not screw up path permissions or anything. */
- create_path(header->name, 0777);
+ char *buf, *dir;
+ buf = xstrdup (header->name);
+ dir = dirname (buf);
+ make_directory (dir, -1, FILEUTILS_RECUR);
+ free (buf);
if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY,
header->mode & ~S_IFMT)) < 0) {
error_msg(io_error, header->name, strerror(errno));
if ( size > sizeof(buffer) )
writeSize = readSize = sizeof(buffer);
else {
- int mod = size % 512;
+ int mod = size % TAR_BLOCK_SIZE;
if ( mod != 0 )
- readSize = size + (512 - mod);
+ readSize = size + (TAR_BLOCK_SIZE - mod);
else
readSize = size;
writeSize = size;
}
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 )
static int
tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
{
-
if (extractFlag==FALSE || tostdoutFlag==TRUE)
return( TRUE);
- if (create_path(header->name, header->mode) != TRUE) {
- perror_msg("%s: Cannot mkdir", header->name);
+ if (make_directory(header->name, header->mode, FILEUTILS_RECUR) < 0)
return( FALSE);
- }
- /* 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 && errno != EEXIST) {
- perror_msg("%s", header->name);
- return FALSE;
- }
fixUpPermissions(header);
return( TRUE);
return( FALSE);
}
- /* Now set permissions etc for the new directory */
+ /* Now set permissions etc. for the new directory */
fixUpPermissions(header);
return( TRUE);
}
/* 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
}
}
- /* Now set permissions etc for the new directory */
+ /* Now set permissions etc. for the new directory */
fixUpPermissions(header);
return( TRUE);
}
-/* Read an octal value in a field of the specified width, with optional
- * spaces on both sides of the number and with an optional null character
- * at the end. Returns -1 on an illegal format. */
-static long getOctal(const char *cp, int size)
-{
- long val = 0;
-
- for(;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size == 0) || !is_octal(*cp))
- return -1;
- for(; (size > 0) && is_octal(*cp); size--) {
- val = val * 8 + *cp++ - '0';
- }
- for (;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size > 0) && *cp)
- return -1;
- return val;
-}
-
-
/* Parse the tar header and fill in the nice struct with the details */
static int
readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
static int alreadyWarned=FALSE;
while (*(header->name) == '/')
- ++*(header->name);
+ header->name++;
if (alreadyWarned == FALSE) {
- error_msg("Removing leading '/' from member names\n");
+ error_msg("Removing leading '/' from member names");
alreadyWarned = TRUE;
}
}
- header->mode = getOctal(rawHeader->mode, sizeof(rawHeader->mode));
- header->uid = getOctal(rawHeader->uid, sizeof(rawHeader->uid));
- header->gid = getOctal(rawHeader->gid, sizeof(rawHeader->gid));
- header->size = getOctal(rawHeader->size, sizeof(rawHeader->size));
- header->mtime = getOctal(rawHeader->mtime, sizeof(rawHeader->mtime));
- chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum));
+ header->mode = strtol(rawHeader->mode, NULL, 8);
+ header->uid = strtol(rawHeader->uid, NULL, 8);
+ header->gid = strtol(rawHeader->gid, NULL, 8);
+ header->size = strtol(rawHeader->size, NULL, 8);
+ header->mtime = strtol(rawHeader->mtime, NULL, 8);
+ chksum = strtol(rawHeader->chksum, NULL, 8);
header->type = rawHeader->typeflag;
header->linkname = rawHeader->linkname;
- header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor));
- header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor));
+ header->devmajor = strtol(rawHeader->devmajor, NULL, 8);
+ header->devminor = strtol(rawHeader->devminor, NULL, 8);
/* Check the checksum */
for (i = sizeof(*rawHeader); i-- != 0;) {
return( FALSE);
}
-int exclude_file(char **excluded_files, const char *file)
+static int exclude_file(char **excluded_files, const char *file)
{
int i;
return 0;
}
-int extract_file(char **extract_files, const char *file)
+static int extract_file(char **extract_files, const char *file)
{
int i;
* Read a tar file and extract or list the specified files within it.
* If the list is empty than all files are extracted or listed.
*/
-extern int readTarFile(int tarFd, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList)
{
TarHeader rawHeader;
TarInfo header;
- /* Set the umask for this process so it doesn't
- * screw up permission setting for us later. */
- umask(0);
-
/* Read the tar file, and iterate over it one file at a time */
while ( (status = full_read(tarFd, (char*)&rawHeader, TAR_BLOCK_SIZE)) == TAR_BLOCK_SIZE ) {
goto endgame;
} else {
errorFlag=TRUE;
- error_msg("Bad tar header, skipping\n");
+ error_msg("Bad tar header, skipping");
continue;
}
}
if ( *(header.name) == '\0' )
- goto endgame;
+ continue;
header.tarFd = tarFd;
/* Skip funky extra GNU headers that precede long files */
case REGTYPE0:
/* If the name ends in a '/' then assume it is
* supposed to be a directory, and fall through */
- if (header.name[strlen(header.name)-1] != '/') {
+ if (!last_char_is(header.name,'/')) {
if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE)
errorFlag=TRUE;
break;
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 = LNKTYPE;
strncpy(header.linkname, tbInfo->hlInfo->name, sizeof(header.linkname));
} else if (S_ISLNK(statbuf->st_mode)) {
- int link_size=0;
- char buffer[BUFSIZ];
- header.typeflag = SYMTYPE;
- link_size = readlink(real_name, buffer, sizeof(buffer) - 1);
- if ( link_size < 0) {
- perror_msg("Error reading symlink '%s'", header.name);
+ char *lpath = xreadlink(real_name);
+ if (!lpath) /* Already printed err msg inside xreadlink() */
return ( FALSE);
- }
- buffer[link_size] = '\0';
- strncpy(header.linkname, buffer, sizeof(header.linkname));
+ header.typeflag = SYMTYPE;
+ strncpy(header.linkname, lpath, sizeof(header.linkname));
+ free(lpath);
} else if (S_ISDIR(statbuf->st_mode)) {
header.typeflag = DIRTYPE;
strncat(header.name, "/", sizeof(header.name));
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);
}
- /* Calculate and store the checksum (i.e. the sum of all of the bytes of
+ /* Calculate and store the checksum (i.e., the sum of all of the bytes of
* the header). The checksum field must be filled with blanks for the
* calculation. The checksum field is formatted differently from the
* other fields: it has [6] digits, a null, then a space -- rather than
/* 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, "-"))
if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0)
error_msg_and_die(io_error, tarName, strerror(errno));
- /* Set the umask for this process so it doesn't
- * screw up permission setting for us later. */
- umask(0);
-
/* Read the directory/files and iterate over them one at a time */
while (*argv != NULL) {
if (recursive_action(*argv++, TRUE, FALSE, FALSE,
/* 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);
}