*
* 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/types.h>
#include <sys/sysmacros.h>
#include <getopt.h>
+#include <fnmatch.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
/* Tar file constants */
#ifndef MAJOR
#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
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. */
-static int readTarFile(const char* tarName, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList);
-
-
#ifdef BB_FEATURE_TAR_CREATE
/* Local procedures to save files into a tar file. */
static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
char** excludeList);
#endif
+#if defined BB_FEATURE_TAR_EXCLUDE
+static struct option longopts[] = {
+ { "exclude", 1, NULL, 'e' },
+ { NULL, 0, NULL, 0 }
+};
+#endif
+
extern int tar_main(int argc, char **argv)
{
char** excludeList=NULL;
char** extractList=NULL;
+ const char *tarName="-";
+ const char *cwd=NULL;
#if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0;
- char *excludeFileName ="-";
- FILE *fileList;
- char file[256];
+ FILE *fileList;
+ char file[256];
+#endif
+#if defined BB_FEATURE_TAR_GZIP
+ FILE *comp_file = NULL;
+ int unzipFlag = FALSE;
#endif
- const char *tarName="-";
int listFlag = FALSE;
int extractFlag = FALSE;
int createFlag = FALSE;
int verboseFlag = FALSE;
int tostdoutFlag = FALSE;
int status = FALSE;
- int firstOpt = TRUE;
- int stopIt;
-
+ int opt;
+ pid_t pid;
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;
- 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;
+ show_usage();
+
+ 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:pC:"))
+#else
+ (opt = getopt_long(argc, argv, "cxtzvOf:X:pC:", 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;
+#endif
+ 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");
- /* Remove leading "/"s */
- if (*excludeList[excludeListSize] =='/')
- excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
- /* 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, "rt");
- if (! fileList)
- error_msg_and_die("Exclude file: file not found\n");
- while (!feof(fileList)) {
- fscanf(fileList, "%s", file);
- excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
- excludeList[excludeListSize] = malloc(sizeof(char) * (strlen(file)+1));
- strcpy(excludeList[excludeListSize],file);
- /* Remove leading "/"s */
- if (*excludeList[excludeListSize] == '/')
- excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
- /* 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));
+ chomp(file);
+ 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);
- }
+ 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();
}
}
- /*
+ /*
* 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
- status = writeTarFile(tarName, verboseFlag, argv, excludeList);
+#ifdef BB_FEATURE_TAR_GZIP
+ if (unzipFlag==TRUE)
+ 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
}
if (listFlag == TRUE || extractFlag == TRUE) {
- if (*argv)
- extractList = argv;
- status = readTarFile(tarName, extractFlag, listFlag, tostdoutFlag,
+ int tarFd;
+ if (argv[optind])
+ extractList = argv + optind;
+ /* Open the tar file for reading. */
+ if (!strcmp(tarName, "-"))
+ tarFd = fileno(stdin);
+ else
+ tarFd = open(tarName, O_RDONLY);
+ if (tarFd < 0)
+ perror_msg_and_die("Error opening '%s'", tarName);
+
+#ifdef BB_FEATURE_TAR_GZIP
+ /* unzip tarFd in a seperate process */
+ 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) {
- error_msg("%s: Cannot mkdir: %s\n",
- header->name, strerror(errno));
+ 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) {
- fixUpPermissions(header);
- }
+
+ fixUpPermissions(header);
return( TRUE);
}
return( TRUE);
if (link(header->linkname, header->name) < 0) {
- error_msg("%s: Cannot create hard link to '%s': %s\n",
- header->name, header->linkname, strerror(errno));
+ perror_msg("%s: Cannot create hard link to '%s'", header->name,
+ header->linkname);
return( FALSE);
}
- /* Now set permissions etc for the new directory */
+ /* Now set permissions etc. for the new directory */
fixUpPermissions(header);
return( TRUE);
}
#ifdef S_ISLNK
if (symlink(header->linkname, header->name) < 0) {
- error_msg("%s: Cannot create symlink to '%s': %s\n",
- header->name, header->linkname, strerror(errno));
+ perror_msg("%s: Cannot create symlink to '%s'", header->name,
+ header->linkname);
return( FALSE);
}
/* Try to change ownership of the symlink.
/* 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
if (S_ISCHR(header->mode) || S_ISBLK(header->mode) || S_ISSOCK(header->mode)) {
if (mknod(header->name, header->mode, makedev(header->devmajor, header->devminor)) < 0) {
- error_msg("%s: Cannot mknod: %s\n",
- header->name, strerror(errno));
+ perror_msg("%s: Cannot mknod", header->name);
return( FALSE);
}
} else if (S_ISFIFO(header->mode)) {
if (mkfifo(header->name, header->mode) < 0) {
- error_msg("%s: Cannot mkfifo: %s\n",
- header->name, strerror(errno));
+ perror_msg("%s: Cannot mkfifo", header->name);
return( FALSE);
}
}
- /* 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);
}
+static 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;
+}
+
+static 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.
* If the list is empty than all files are extracted or listed.
*/
-static int readTarFile(const char* tarName, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList)
{
- int status, tarFd=-1;
+ int status;
int errorFlag=FALSE;
int skipNextHeaderFlag=FALSE;
TarHeader rawHeader;
TarInfo header;
- char** tmpList;
-
- /* Open the tar file for reading. */
- if (!strcmp(tarName, "-"))
- tarFd = fileno(stdin);
- else
- tarFd = open(tarName, O_RDONLY);
- if (tarFd < 0) {
- error_msg( "Error opening '%s': %s\n", tarName, strerror(errno));
- return ( FALSE);
- }
-
- /* 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 */
}
#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) {
struct tm *tm = localtime (&(header.mtime));
len=printf("%s ", mode_string(header.mode));
- memset(buf, 0, 8*sizeof(char));
my_getpwuid(buf, header.uid);
if (! *buf)
len+=printf("%d", header.uid);
else
len+=printf("%s", buf);
- memset(buf, 0, 8*sizeof(char));
my_getgrgid(buf, header.gid);
if (! *buf)
len+=printf("/%-d ", header.gid);
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);
}
close(tarFd);
if (status > 0) {
/* Bummer - we read a partial header */
- error_msg( "Error reading '%s': %s\n", tarName, strerror(errno));
+ perror_msg("Error reading tar file");
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);
/* 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");
+ error_msg( "Error exit delayed from previous errors");
else
return( TRUE);
}
/* Write out a tar header for the specified file/directory/whatever */
static int
-writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *statbuf)
+writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
+ const char *real_name, struct stat *statbuf)
{
long chksum=0;
struct TarHeader header;
-#if defined BB_FEATURE_TAR_EXCLUDE
- char** tmpList;
-#endif
const unsigned char *cp = (const unsigned char *) &header;
ssize_t size = sizeof(struct TarHeader);
memset( &header, 0, size);
- if (*fileName=='/') {
- static int alreadyWarned=FALSE;
- if (alreadyWarned==FALSE) {
- error_msg("Removing leading '/' from member names\n");
- alreadyWarned=TRUE;
- }
- strncpy(header.name, fileName+1, sizeof(header.name));
- }
- else {
- strncpy(header.name, fileName, sizeof(header.name));
- }
-
-#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 || (
- header.name[strlen(header.name)-1]=='/'
- && strncmp( *tmpList, header.name,
- MIN(strlen(header.name)-1, strlen(*tmpList)))==0)) {
- /* Set the mode to something that is not a regular file, thereby
- * faking out writeTarFile into thinking that nothing further need
- * be done for this file. Yes, I know this is ugly, but it works. */
- statbuf->st_mode = 0;
- return( TRUE);
- }
- }
-#endif
+ strncpy(header.name, header_name, sizeof(header.name));
putOctal(header.mode, sizeof(header.mode), statbuf->st_mode);
putOctal(header.uid, sizeof(header.uid), statbuf->st_uid);
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(fileName, buffer, sizeof(buffer) - 1);
- if ( link_size < 0) {
- error_msg("Error reading symlink '%s': %s\n", header.name, strerror(errno));
+ 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", fileName);
+ 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
/* Now write the header out to disk */
if ((size=full_write(tbInfo->tarFd, (char*)&header, sizeof(struct TarHeader))) < 0) {
- error_msg(io_error, fileName, strerror(errno));
+ error_msg(io_error, real_name, strerror(errno));
return ( FALSE);
}
/* Pad the header up to the tar block size */
static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* userData)
{
struct TarBallInfo *tbInfo = (struct TarBallInfo *)userData;
+ const char *header_name;
/*
** Check to see if we are dealing with a hard link.
/* 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);
}
+ header_name = fileName;
+ while (header_name[0] == '/') {
+ static int alreadyWarned=FALSE;
+ if (alreadyWarned==FALSE) {
+ error_msg("Removing leading '/' from member names");
+ alreadyWarned=TRUE;
+ }
+ header_name++;
+ }
+
if (strlen(fileName) >= NAME_SIZE) {
error_msg(name_longer_than_foo, NAME_SIZE);
return ( TRUE);
}
- if (writeTarHeader(tbInfo, fileName, statbuf)==FALSE) {
+ if (header_name[0] == '\0')
+ return TRUE;
+
+#if defined BB_FEATURE_TAR_EXCLUDE
+ if (exclude_file(tbInfo->excludeList, header_name)) {
+ return SKIP;
+ }
+#endif
+
+ if (writeTarHeader(tbInfo, header_name, fileName, statbuf)==FALSE) {
return( FALSE);
}
/* 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, "-"))
else
tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (tbInfo.tarFd < 0) {
- error_msg( "Error opening '%s': %s\n", tarName, strerror(errno));
+ perror_msg( "Error opening '%s'", tarName);
freeHardLinkInfo(&tbInfo.hlInfoHead);
return ( FALSE);
}
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);
}
projects / oweals / busybox.git / blobdiff