/* vi: set sw=4 ts=4: */
/*
- * Mini tar implementation for busybox based on code taken from sash.
+ * Mini tar implementation for busybox
*
- * Copyright (c) 1999 by David I. Bell
- * Permission is granted to use, distribute, or modify this source,
- * provided that this copyright notice remains intact.
+ * 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)
*
- * Permission to distribute this code under the GPL has been granted.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
- * Modified for busybox by Erik Andersen <andersee@debian.org>
- * Adjusted to grok stdin/stdout options.
+ * Based in part in the tar implementation in sash
+ * Copyright (c) 1999 by David I. Bell
+ * Permission is granted to use, distribute, or modify this source,
+ * provided that this copyright notice remains intact.
+ * Permission to distribute sash derived code under the GPL has been granted.
*
- * Modified to handle device special files by Matt Porter
- * <porter@debian.org>
+ * Based in part on the tar implementation from busybox-0.28
+ * Copyright (C) 1995 Bruce Perens
+ * This is free software under the GNU General Public License.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
-#include "internal.h"
#include <stdio.h>
#include <dirent.h>
#include <errno.h>
#include <utime.h>
#include <sys/types.h>
#include <sys/sysmacros.h>
-#include <sys/param.h> /* for PATH_MAX */
-
-
-#ifdef BB_FEATURE_TAR_CREATE
-
-static const char tar_usage[] =
- "tar -[cxtvOf] [tarFileName] [FILE] ...\n\n"
- "Create, extract, or list files from a tar file.\n\n"
- "Options:\n"
-
- "\tc=create, x=extract, t=list contents, v=verbose,\n"
- "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
-
-#else
-
-static const char tar_usage[] =
- "tar -[xtvOf] [tarFileName] [FILE] ...\n\n"
- "Extract, or list files stored in a tar file. This\n"
- "version of tar does not support creation of tar files.\n\n"
- "Options:\n"
-
- "\tx=extract, t=list contents, v=verbose,\n"
- "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
-
+#include <getopt.h>
+#include <fnmatch.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#define bb_need_io_error
+#define bb_need_name_longer_than_foo
+#include "messages.c"
+
+#ifdef BB_FEATURE_TAR_GZIP
+extern int unzip(int in, int out);
+extern int gunzip_init();
#endif
-
/* Tar file constants */
+#ifndef MAJOR
+#define MAJOR(dev) (((dev)>>8)&0xff)
+#define MINOR(dev) ((dev)&0xff)
+#endif
+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
{
/* byte offset */
- char name[100]; /* 0 */
- char mode[8]; /* 100 */
- char uid[8]; /* 108 */
- char gid[8]; /* 116 */
- char size[12]; /* 124 */
- char mtime[12]; /* 136 */
- char chksum[8]; /* 148 */
- char typeflag; /* 156 */
- char linkname[100]; /* 157 */
- char magic[6]; /* 257 */
- char version[2]; /* 263 */
- char uname[32]; /* 265 */
- char gname[32]; /* 297 */
- char devmajor[8]; /* 329 */
- char devminor[8]; /* 337 */
- char prefix[155]; /* 345 */
- /* padding 500 */
+ char name[NAME_SIZE]; /* 0-99 */
+ char mode[8]; /* 100-107 */
+ char uid[8]; /* 108-115 */
+ char gid[8]; /* 116-123 */
+ char size[12]; /* 124-135 */
+ char mtime[12]; /* 136-147 */
+ char chksum[8]; /* 148-155 */
+ char typeflag; /* 156-156 */
+ char linkname[NAME_SIZE]; /* 157-256 */
+ char magic[6]; /* 257-262 */
+ char version[2]; /* 263-264 */
+ char uname[32]; /* 265-296 */
+ char gname[32]; /* 297-328 */
+ char devmajor[8]; /* 329-336 */
+ char devminor[8]; /* 337-344 */
+ char prefix[155]; /* 345-499 */
+ char padding[12]; /* 500-512 (pad to exactly the TAR_BLOCK_SIZE) */
};
typedef struct TarHeader TarHeader;
/* A few useful constants */
#define TAR_MAGIC "ustar" /* ustar and a null */
-#define TAR_VERSION "00" /* 00 and no null */
-#define TAR_MAGIC_LEN 6
-#define TAR_VERSION_LEN 2
-#define TAR_NAME_LEN 100
-#define TAR_BLOCK_SIZE 512
+#define TAR_VERSION " " /* Be compatable with GNU tar format */
+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
DIRTYPE = '5', /* directory */
FIFOTYPE = '6', /* FIFO special */
CONTTYPE = '7', /* reserved */
+ GNULONGLINK = 'K', /* GNU long (>100 chars) link name */
+ GNULONGNAME = 'L', /* GNU long (>100 chars) file name */
};
typedef enum TarFileType TarFileType;
time_t mtime; /* Last-modified time */
enum TarFileType type; /* Regular, directory, link, etc */
char * linkname; /* Name for symbolic and hard links */
- dev_t device; /* Special device for mknod() */
+ long devmajor; /* Major number for special device */
+ long devminor; /* Minor number for special device */
};
typedef struct TarInfo TarInfo;
-/* Static data */
-static const unsigned long TarChecksumOffset = (const unsigned long)&(((TarHeader *)0)->chksum);
-
-
/* Local procedures to restore files from a tar file. */
-static int readTarFile(const char* tarName, int extractFlag, int listFlag,
- int tostdoutFlag, int verboseFlag);
-static long getOctal(const char *cp, int len);
-static int parseTarHeader(struct TarHeader *rawHeader, struct TarInfo *header);
+extern 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 void saveFile(const char *fileName, int seeLinks);
-static void saveRegularFile(const char *fileName,
- const struct stat *statbuf);
-static void saveDirectory(const char *fileName,
- const struct stat *statbuf);
-static void writeHeader(const char *fileName, const struct stat *statbuf);
-static void writeTarFile(int argc, char **argv);
-static void writeTarBlock(const char *buf, int len);
-static int putOctal(char *cp, int len, long value);
+/* Local procedures to save files into a tar file. */
+static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
+ char** excludeList);
+#endif
+
+#ifdef BB_FEATURE_TAR_GZIP
+/* Signal handler for when child gzip process dies... */
+static 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");
+
+ if ( (child_pid = fork()) == -1)
+ error_msg_and_die("fork failure");
+
+ 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
+static struct option longopts[] = {
+ { "exclude", 1, NULL, 'e' },
+ { NULL, 0, NULL, 0 }
+};
+#endif
extern int tar_main(int argc, char **argv)
{
- const char *tarName=NULL;
- const char *options;
+ char** excludeList=NULL;
+ char** extractList=NULL;
+ const char *tarName="-";
+#if defined BB_FEATURE_TAR_EXCLUDE
+ int excludeListSize=0;
+ FILE *fileList;
+ char file[256];
+#endif
+#if defined BB_FEATURE_TAR_GZIP
+ int unzipFlag = FALSE;
+#endif
int listFlag = FALSE;
int extractFlag = FALSE;
int createFlag = FALSE;
int verboseFlag = FALSE;
int tostdoutFlag = FALSE;
+ int status = FALSE;
+ int opt;
- argc--;
- argv++;
-
- if (argc < 1)
- usage(tar_usage);
-
- /* Parse options */
- if (**argv == '-')
- options = (*argv++) + 1;
- else
- options = (*argv++);
- argc--;
-
- for (; *options; options++) {
- switch (*options) {
- case 'f':
- if (tarName != NULL)
- fatalError( "Only one 'f' option allowed\n");
-
- tarName = *argv++;
- if (tarName == NULL)
- fatalError( "Option requires an argument: No file specified\n");
- argc--;
-
- break;
-
- case 't':
- if (extractFlag == TRUE || createFlag == TRUE)
- goto flagError;
- listFlag = TRUE;
- break;
-
- case 'x':
- if (listFlag == TRUE || createFlag == TRUE)
- goto flagError;
- extractFlag = TRUE;
- break;
- case 'c':
- if (extractFlag == TRUE || listFlag == TRUE)
- goto flagError;
- createFlag = TRUE;
- break;
-
- case 'v':
- verboseFlag = TRUE;
- break;
-
- case 'O':
- tostdoutFlag = TRUE;
- break;
+ if (argc <= 1)
+ show_usage();
- case '-':
- usage(tar_usage);
- break;
+ if (argv[1][0] != '-') {
+ char *tmp = xmalloc(strlen(argv[1]) + 2);
+ tmp[0] = '-';
+ strcpy(tmp + 1, argv[1]);
+ argv[1] = tmp;
+ }
- default:
- fatalError( "Unknown tar flag '%c'\n"
- "Try `tar --help' for more information\n", *options);
+ 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;
+#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':
+ 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
+ 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
- fatalError( "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
- exit(writeTarFile(argc, argv));
+#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
- } else {
- exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, verboseFlag));
}
+ if (listFlag == TRUE || extractFlag == TRUE) {
+ 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)
+ tarFd = tar_unzip_init(tarFd);
+#endif
+ status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag,
+ verboseFlag, extractList, excludeList);
+ }
+
+ if (status == TRUE)
+ return EXIT_SUCCESS;
+ else
+ return EXIT_FAILURE;
flagError:
- fatalError( "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
-tarExtractRegularFile(TarInfo *header, int extractFlag, int listFlag, int tostdoutFlag, int verboseFlag)
+fixUpPermissions(TarInfo *header)
{
- return;
+ struct utimbuf t;
+ /* Now set permissions etc for the new file */
+ chown(header->name, header->uid, header->gid);
+ chmod(header->name, header->mode);
+ /* Reset the time */
+ t.actime = time(0);
+ t.modtime = header->mtime;
+ utime(header->name, &t);
}
-static void
-tarExtractDirectory(TarInfo *header, int extractFlag, int listFlag, int tostdoutFlag, int verboseFlag)
+static int
+tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
{
- return;
+ size_t writeSize;
+ size_t readSize;
+ size_t actualWriteSz;
+ char buffer[BUFSIZ];
+ size_t size = header->size;
+ int outFd=fileno(stdout);
+
+ /* Open the file to be written, if a file is supposed to be written */
+ 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);
+ if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY,
+ header->mode & ~S_IFMT)) < 0) {
+ error_msg(io_error, header->name, strerror(errno));
+ return( FALSE);
+ }
+ }
+
+ /* Write out the file, if we are supposed to be doing that */
+ while ( size > 0 ) {
+ actualWriteSz=0;
+ if ( size > sizeof(buffer) )
+ writeSize = readSize = sizeof(buffer);
+ else {
+ int mod = size % 512;
+ if ( mod != 0 )
+ readSize = size + (512 - 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");
+ return( FALSE);
+ }
+ if ( readSize < writeSize )
+ writeSize = readSize;
+
+ /* Write out the file, if we are supposed to be doing that */
+ if (extractFlag==TRUE) {
+
+ if ((actualWriteSz=full_write(outFd, buffer, writeSize)) != writeSize ) {
+ /* Output file seems to have a problem */
+ error_msg(io_error, header->name, strerror(errno));
+ return( FALSE);
+ }
+ } else {
+ actualWriteSz=writeSize;
+ }
+
+ size -= actualWriteSz;
+ }
+
+ /* Now we are done writing the file out, so try
+ * and fix up the permissions and whatnot */
+ if (extractFlag==TRUE && tostdoutFlag==FALSE) {
+ close(outFd);
+ fixUpPermissions(header);
+ }
+ return( TRUE);
}
-static void
-tarExtractHardLink(TarInfo *header, int extractFlag, int listFlag, int tostdoutFlag, int verboseFlag)
+static int
+tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
{
- return;
+
+ if (extractFlag==FALSE || tostdoutFlag==TRUE)
+ return( TRUE);
+
+ if (create_path(header->name, header->mode) != TRUE) {
+ perror_msg("%s: Cannot mkdir", header->name);
+ 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);
}
-static void
-tarExtractSymLink(TarInfo *header, int extractFlag, int listFlag, int tostdoutFlag, int verboseFlag)
+static int
+tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
{
- return;
+ if (extractFlag==FALSE || tostdoutFlag==TRUE)
+ return( TRUE);
+
+ if (link(header->linkname, header->name) < 0) {
+ perror_msg("%s: Cannot create hard link to '%s'", header->name,
+ header->linkname);
+ return( FALSE);
+ }
+
+ /* Now set permissions etc for the new directory */
+ fixUpPermissions(header);
+ return( TRUE);
}
-static void
-tarExtractSpecial(TarInfo *header, int extractFlag, int listFlag, int tostdoutFlag, int verboseFlag)
+static int
+tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
{
- return;
+ if (extractFlag==FALSE || tostdoutFlag==TRUE)
+ return( TRUE);
+
+#ifdef S_ISLNK
+ if (symlink(header->linkname, header->name) < 0) {
+ perror_msg("%s: Cannot create symlink to '%s'", header->name,
+ header->linkname);
+ return( FALSE);
+ }
+ /* Try to change ownership of the symlink.
+ * If libs doesn't support that, don't bother.
+ * Changing the pointed-to-file is the Wrong Thing(tm).
+ */
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+ lchown(header->name, header->uid, header->gid);
+#endif
+
+ /* 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",
+ header->name, header->linkname,
+ "symlinks not supported");
+#endif
+ return( TRUE);
+}
+
+static int
+tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
+{
+ if (extractFlag==FALSE || tostdoutFlag==TRUE)
+ return( TRUE);
+
+ 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) {
+ perror_msg("%s: Cannot mknod", header->name);
+ return( FALSE);
+ }
+ } else if (S_ISFIFO(header->mode)) {
+ if (mkfifo(header->name, header->mode) < 0) {
+ perror_msg("%s: Cannot mkfifo", header->name);
+ return( FALSE);
+ }
+ }
+
+ /* 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)
+{
+ int i;
+ long chksum, sum=0;
+ unsigned char *s = (unsigned char *)rawHeader;
+
+ header->name = rawHeader->name;
+ /* Check for and relativify any absolute paths */
+ if ( *(header->name) == '/' ) {
+ static int alreadyWarned=FALSE;
+
+ while (*(header->name) == '/')
+ ++*(header->name);
+
+ if (alreadyWarned == FALSE) {
+ 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->type = rawHeader->typeflag;
+ header->linkname = rawHeader->linkname;
+ header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor));
+ header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor));
+
+ /* Check the checksum */
+ for (i = sizeof(*rawHeader); i-- != 0;) {
+ sum += *s++;
+ }
+ /* Remove the effects of the checksum field (replace
+ * with blanks for the purposes of the checksum) */
+ s = rawHeader->chksum;
+ for (i = sizeof(rawHeader->chksum) ; i-- != 0;) {
+ sum -= *s++;
+ }
+ sum += ' ' * sizeof(rawHeader->chksum);
+ if (sum == chksum )
+ return ( TRUE);
+ 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,
- int tostdoutFlag, int verboseFlag)
+extern int readTarFile(int tarFd, int extractFlag, int listFlag,
+ int tostdoutFlag, int verboseFlag, char** extractList,
+ char** excludeList)
{
- int status, tarFd=0;
+ int status;
int errorFlag=FALSE;
+ int skipNextHeaderFlag=FALSE;
TarHeader rawHeader;
TarInfo header;
- /* Open the tar file for reading. */
- if (!strcmp(tarName, "-"))
- tarFd = fileno(stdin);
- else
- tarFd = open(tarName, O_RDONLY);
- if (tarFd < 0) {
- errorMsg( "Error opening '%s': %s", 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 */
- while ( (status = fullRead(tarFd, (char*)&rawHeader, TAR_BLOCK_SIZE)) == TAR_BLOCK_SIZE ) {
- /* Now see if the header looks ok */
- if ( parseTarHeader(&rawHeader, &header) == FALSE ) {
- close( tarFd);
+ /* 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 ) {
+
+ /* Try to read the header */
+ if ( readTarHeader(&rawHeader, &header) == FALSE ) {
if ( *(header.name) == '\0' ) {
goto endgame;
} else {
errorFlag=TRUE;
- errorMsg("Bad tar header, skipping\n");
+ error_msg("Bad tar header, skipping");
continue;
}
}
if ( *(header.name) == '\0' )
goto endgame;
-
- if (extractFlag == FALSE) {
+ header.tarFd = tarFd;
+
+ /* Skip funky extra GNU headers that precede long files */
+ if ( (header.type == GNULONGNAME) || (header.type == GNULONGLINK) ) {
+ skipNextHeaderFlag=TRUE;
+ if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
+ errorFlag = TRUE;
+ continue;
+ }
+ if ( skipNextHeaderFlag == TRUE ) {
+ skipNextHeaderFlag=FALSE;
+ error_msg(name_longer_than_foo, NAME_SIZE);
+ if (tarExtractRegularFile(&header, FALSE, FALSE) == FALSE)
+ errorFlag = TRUE;
+ continue;
+ }
+
+#if defined BB_FEATURE_TAR_EXCLUDE
+ if (exclude_file(excludeList, header.name)) {
+ /* There are not the droids you're looking for, move along */
+ /* 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 (!extract_file(extractList, header.name)) {
+ /* There are not the droids you're looking for, move along */
+ /* 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) {
+ /* Special treatment if the list (-t) flag is on */
if (verboseFlag == TRUE) {
- printf("%s %3d/%-d ", modeString(header.mode), header.uid, header.gid);
- if (header.type==CHRTYPE || header.type==BLKTYPE)
- printf("%4d,%4d %s ", MAJOR(header.device),
- MINOR(header.device), timeString(header.mtime));
+ int len, len1;
+ char buf[35];
+ struct tm *tm = localtime (&(header.mtime));
+
+ len=printf("%s ", mode_string(header.mode));
+ my_getpwuid(buf, header.uid);
+ if (! *buf)
+ len+=printf("%d", header.uid);
+ else
+ len+=printf("%s", buf);
+ my_getgrgid(buf, header.gid);
+ if (! *buf)
+ len+=printf("/%-d ", header.gid);
else
- printf("%9ld %s ", header.size, timeString(header.mtime));
+ len+=printf("/%-s ", buf);
+
+ if (header.type==CHRTYPE || header.type==BLKTYPE) {
+ len1=snprintf(buf, sizeof(buf), "%ld,%-ld ",
+ header.devmajor, header.devminor);
+ } else {
+ len1=snprintf(buf, sizeof(buf), "%lu ", (long)header.size);
+ }
+ /* Jump through some hoops to make the columns match up */
+ for(;(len+len1)<31;len++)
+ printf(" ");
+ printf(buf);
+
+ /* Use ISO 8610 time format */
+ if (tm) {
+ printf ("%04d-%02d-%02d %02d:%02d:%02d ",
+ tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+ }
}
printf("%s", header.name);
-
- if (header.type==LNKTYPE)
- printf(" (link to \"%s\")", hp->linkName);
- else if (header.type==SYMTYPE)
- printf(" (symlink to \"%s\")", hp->linkName);
+ if (verboseFlag == TRUE) {
+ if (header.type==LNKTYPE) /* If this is a link, say so */
+ printf(" link to %s", header.linkname);
+ else if (header.type==SYMTYPE)
+ printf(" -> %s", header.linkname);
+ }
printf("\n");
- continue;
}
+ /* List contents if we are supposed to do that */
+ if (verboseFlag == TRUE && extractFlag == TRUE) {
+ /* Now the normal listing */
+ FILE *vbFd = stdout;
+ if (tostdoutFlag == TRUE) // If the archive goes to stdout, verbose to stderr
+ vbFd = stderr;
+ fprintf(vbFd, "%s\n", header.name);
+ }
+
+ /* Remove files if we would overwrite them */
+ if (extractFlag == TRUE && tostdoutFlag == FALSE)
+ unlink(header.name);
+
/* If we got here, we can be certain we have a legitimate
* header to work with. So work with it. */
switch ( header.type ) {
/* 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] != '/') {
- tarExtractRegularFile(&header, extractFlag, listFlag, tostdoutFlag, verboseFlag);
+ if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE)
+ errorFlag=TRUE;
break;
}
case DIRTYPE:
- tarExtractDirectory( &header, extractFlag, listFlag, tostdoutFlag, verboseFlag);
+ if (tarExtractDirectory( &header, extractFlag, tostdoutFlag)==FALSE)
+ errorFlag=TRUE;
break;
case LNKTYPE:
- tarExtractHardLink( &header, extractFlag, listFlag, tostdoutFlag, verboseFlag);
+ if (tarExtractHardLink( &header, extractFlag, tostdoutFlag)==FALSE)
+ errorFlag=TRUE;
break;
case SYMTYPE:
- tarExtractSymLink( &header, extractFlag, listFlag, tostdoutFlag, verboseFlag);
+ if (tarExtractSymLink( &header, extractFlag, tostdoutFlag)==FALSE)
+ errorFlag=TRUE;
break;
case CHRTYPE:
case BLKTYPE:
case FIFOTYPE:
- tarExtractSpecial( &header, extractFlag, listFlag, tostdoutFlag, verboseFlag);
+ if (tarExtractSpecial( &header, extractFlag, tostdoutFlag)==FALSE)
+ errorFlag=TRUE;
+ break;
+#if 0
+ /* Handled earlier */
+ case GNULONGNAME:
+ case GNULONGLINK:
+ skipNextHeaderFlag=TRUE;
break;
+#endif
default:
+ 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 */
- errorMsg( "Error reading '%s': %s", tarName, strerror(errno));
+ perror_msg("Error reading tar file");
return ( FALSE);
}
- else
+ else if (errorFlag==TRUE) {
+ error_msg( "Error exit delayed from previous errors");
+ return( FALSE);
+ } else
return( status);
- /* Stuff we do when we know we are done with the file */
+ /* Stuff to do when we are done */
endgame:
close( tarFd);
if ( *(header.name) == '\0' ) {
- if (errorFlag==FALSE)
+ if (errorFlag==TRUE)
+ error_msg( "Error exit delayed from previous errors");
+ else
return( TRUE);
}
return( FALSE);
}
+
+#ifdef BB_FEATURE_TAR_CREATE
+
/*
- * 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)
+** writeTarFile(), writeFileToTarball(), and writeTarHeader() are
+** the only functions that deal with the HardLinkInfo structure.
+** Even these functions use the xxxHardLinkInfo() functions.
+*/
+typedef struct HardLinkInfo HardLinkInfo;
+struct HardLinkInfo
{
- long val = 0;
+ HardLinkInfo *next; /* Next entry in list */
+ dev_t dev; /* Device number */
+ ino_t ino; /* Inode number */
+ short linkCount; /* (Hard) Link Count */
+ char name[1]; /* Start of filename (must be last) */
+};
- for(;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size == 0) || !isOctal(*cp))
- return -1;
- for(; (size > 0) && isOctal(*cp); size--) {
- val = val * 8 + *cp++ - '0';
+/* Some info to be carried along when creating a new tarball */
+struct TarBallInfo
+{
+ char* fileName; /* File name of the tarball */
+ int tarFd; /* Open-for-write file descriptor
+ for the tarball */
+ struct stat statBuf; /* Stat info for the tarball, letting
+ us know the inode and device that the
+ tarball lives, so we can avoid trying
+ to include the tarball into itself */
+ int verboseFlag; /* Whether to print extra stuff or not */
+ char** excludeList; /* List of files to not include */
+ HardLinkInfo *hlInfoHead; /* Hard Link Tracking Information */
+ HardLinkInfo *hlInfo; /* Hard Link Info for the current file */
+};
+typedef struct TarBallInfo TarBallInfo;
+
+
+/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
+static void
+addHardLinkInfo (HardLinkInfo **hlInfoHeadPtr, dev_t dev, ino_t ino,
+ short linkCount, const char *name)
+{
+ /* Note: hlInfoHeadPtr can never be NULL! */
+ HardLinkInfo *hlInfo;
+
+ hlInfo = (HardLinkInfo *)xmalloc(sizeof(HardLinkInfo)+strlen(name)+1);
+ if (hlInfo) {
+ hlInfo->next = *hlInfoHeadPtr;
+ *hlInfoHeadPtr = hlInfo;
+ hlInfo->dev = dev;
+ hlInfo->ino = ino;
+ hlInfo->linkCount = linkCount;
+ strcpy(hlInfo->name, name);
}
- for (;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size > 0) && *cp)
- return -1;
- return val;
+ return;
}
-/* Parse the tar header and fill in the nice struct with the details */
-static int
-parseTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
+static void
+freeHardLinkInfo (HardLinkInfo **hlInfoHeadPtr)
{
- int i;
- long chksum, sum;
- unsigned char *s = (unsigned char *)rawHeader;
-
- header->name = rawHeader->name;
- 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->type = rawHeader->typeflag;
- header->linkname = rawHeader->linkname;
- header->device = MAJOR(getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor))) |
- MINOR(getOctal(rawHeader->devminor, sizeof(rawHeader->devminor)));
-
- /* Check the checksum */
- sum = ' ' * sizeof(rawHeader->chksum);
- for ( i = TarChecksumOffset; i > 0; i-- )
- sum += *s++;
- s += sizeof(rawHeader->chksum);
- for ( i = (512 - TarChecksumOffset - sizeof(rawHeader->chksum)); i > 0; i-- )
- sum += *s++;
- if (sum == chksum )
- return ( TRUE);
- return( FALSE);
-}
-
-#if 0
- if ((header->mode < 0) || (header->uid < 0) ||
- (header->gid < 0) || (header->size < 0)) {
- errorMsg(stderr, "Bad tar header, skipping\n");
- return( FALSE);
- }
-
- badHeader = FALSE;
- skipFileFlag = FALSE;
- devFileFlag = FALSE;
-
- /*
- * Check for the file modes.
- */
- hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) ||
- (hp->typeFlag == TAR_TYPE_HARD_LINK - '0'));
-
- softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) ||
- (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0'));
-
- /*
- * Check for a directory.
- */
- if (outName[strlen(outName) - 1] == '/')
- mode |= S_IFDIR;
-
- /*
- * Check for absolute paths in the file.
- * If we find any, then warn the user and make them relative.
- */
- if (*outName == '/') {
- while (*outName == '/')
- outName++;
-
- if (warnedRoot == FALSE) {
- fprintf(stderr,
- "Absolute path detected, removing leading slashes\n");
- }
-
- warnedRoot = TRUE;
- }
-
- /*
- * See if we want this file to be restored.
- * If not, then set up to skip it.
- */
- if (wantFileName(outName, argc, argv) == FALSE) {
- if (!hardLink && !softLink && (S_ISREG(mode) || S_ISCHR(mode)
- || S_ISBLK(mode) || S_ISSOCK(mode)
- || S_ISFIFO(mode))) {
- inHeader = (size == 0) ? TRUE : FALSE;
- dataCc = size;
- }
-
- skipFileFlag = TRUE;
-
- return;
- }
-
- /*
- * This file is to be handled.
- * If we aren't extracting then just list information about the file.
- */
- if (extractFlag == FALSE) {
- if (verboseFlag == TRUE) {
- printf("%s %3d/%-d ", modeString(mode), uid, gid);
- if (S_ISCHR(mode) || S_ISBLK(mode))
- printf("%4d,%4d %s ", major, minor, timeString(mtime));
- else
- printf("%9ld %s ", size, timeString(mtime));
- }
- printf("%s", outName);
-
- if (hardLink)
- printf(" (link to \"%s\")", hp->linkName);
- else if (softLink)
- printf(" (symlink to \"%s\")", hp->linkName);
- else if (S_ISREG(mode) || S_ISCHR(mode) || S_ISBLK(mode) ||
- S_ISSOCK(mode) || S_ISFIFO(mode)) {
- inHeader = (size == 0) ? TRUE : FALSE;
- dataCc = size;
- }
-
- printf("\n");
-
- return;
- }
-
- /*
- * We really want to extract the file.
- */
- if (verboseFlag == TRUE)
- printf("x %s\n", outName);
-
- if (hardLink) {
- if (link(hp->linkName, outName) < 0) {
- perror(outName);
- return;
- }
- /* Set the file time */
- utb.actime = mtime;
- utb.modtime = mtime;
- utime(outName, &utb);
- /* Set the file permissions */
- chown(outName, uid, gid);
- chmod(outName, mode);
- return;
- }
-
- if (softLink) {
-#ifdef S_ISLNK
- if (symlink(hp->linkName, outName) < 0) {
- perror(outName);
- return;
- }
- /* Try to change ownership of the symlink.
- * If libs doesn't support that, don't bother.
- * Changing the pointed-to file is the Wrong Thing(tm).
- */
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
- lchown(outName, uid, gid);
-#endif
-
- /* Do not change permissions or date on symlink,
- * since it changes the pointed to file instead. duh. */
-#else
- fprintf(stderr, "Cannot create symbolic links\n");
-#endif
- return;
- }
-
- /* Set the umask for this process so it doesn't
- * screw things up. */
- umask(0);
-
- /*
- * If the file is a directory, then just create the path.
- */
- if (S_ISDIR(mode)) {
- if (createPath(outName, mode) == TRUE) {
- /* make the final component, just in case it was
- * omitted by createPath() (which will skip the
- * directory if it doesn't have a terminating '/')
- */
- mkdir(outName, mode);
-
- /* Set the file time */
- utb.actime = mtime;
- utb.modtime = mtime;
- utime(outName, &utb);
- /* Set the file permissions */
- chown(outName, uid, gid);
- chmod(outName, mode);
- return;
- }
- return;
- }
-
- /*
- * There is a file to write.
- * First create the path to it if necessary with default permissions.
- */
- createPath(outName, 0777);
-
- inHeader = (size == 0) ? TRUE : FALSE;
- dataCc = size;
-
- /*
- * Start the output file.
- */
- if (tostdoutFlag == TRUE)
- outFd = fileno(stdout);
- else {
- if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode)) {
- devFileFlag = TRUE;
- outFd = mknod(outName, mode, makedev(major, minor));
- } else if (S_ISFIFO(mode)) {
- devFileFlag = TRUE;
- outFd = mkfifo(outName, mode);
- } else {
- outFd = open(outName, O_WRONLY | O_CREAT | O_TRUNC, mode);
- }
- if (outFd < 0) {
- perror(outName);
- skipFileFlag = TRUE;
- return;
+ HardLinkInfo *hlInfo = NULL;
+ HardLinkInfo *hlInfoNext = NULL;
+
+ if (hlInfoHeadPtr) {
+ hlInfo = *hlInfoHeadPtr;
+ while (hlInfo) {
+ hlInfoNext = hlInfo->next;
+ free(hlInfo);
+ hlInfo = hlInfoNext;
}
- /* Set the file time */
- utb.actime = mtime;
- utb.modtime = mtime;
- utime(outName, &utb);
- /* Set the file permissions */
- chown(outName, uid, gid);
- chmod(outName, mode);
+ *hlInfoHeadPtr = NULL;
}
+ return;
+}
-
- /*
- * If the file is empty, then that's all we need to do.
- */
- if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) {
- close(outFd);
- outFd = -1;
+/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
+static HardLinkInfo *
+findHardLinkInfo (HardLinkInfo *hlInfo, dev_t dev, ino_t ino)
+{
+ while(hlInfo) {
+ if ((ino == hlInfo->ino) && (dev == hlInfo->dev))
+ break;
+ hlInfo = hlInfo->next;
}
+ return(hlInfo);
}
-
-/*
- * Handle a data block of some specified size that was read.
- */
-static void readData(const char *cp, int count)
+/* Put an octal string into the specified buffer.
+ * The number is zero and space padded and possibly null padded.
+ * Returns TRUE if successful. */
+static int putOctal (char *cp, int len, long value)
{
- /*
- * Reduce the amount of data left in this file.
- * If there is no more data left, then we need to read
- * the header again.
- */
- dataCc -= count;
-
- if (dataCc <= 0)
- inHeader = TRUE;
+ int tempLength;
+ char tempBuffer[32];
+ char *tempString = tempBuffer;
- /*
- * If we aren't extracting files or this file is being
- * skipped then do nothing more.
- */
- if (extractFlag == FALSE || skipFileFlag == TRUE)
- return;
+ /* Create a string of the specified length with an initial space,
+ * leading zeroes and the octal number, and a trailing null. */
+ sprintf (tempString, "%0*lo", len - 1, value);
- /*
- * Write the data to the output file.
- */
- if (fullWrite(outFd, cp, count) < 0) {
- perror(outName);
- if (tostdoutFlag == FALSE) {
- close(outFd);
- outFd = -1;
- }
- skipFileFlag = TRUE;
- return;
+ /* If the string is too large, suppress the leading space. */
+ tempLength = strlen (tempString) + 1;
+ if (tempLength > len) {
+ tempLength--;
+ tempString++;
}
- /*
- * Check if we are done writing to the file now.
- */
- if (dataCc <= 0 && tostdoutFlag == FALSE) {
- struct utimbuf utb;
+ /* If the string is still too large, suppress the trailing null. */
+ if (tempLength > len)
+ tempLength--;
- if (close(outFd))
- perror(outName);
+ /* If the string is still too large, fail. */
+ if (tempLength > len)
+ return FALSE;
- /* Set the file time */
- utb.actime = mtime;
- utb.modtime = mtime;
- utime(outName, &utb);
- /* Set the file permissions */
- chown(outName, uid, gid);
- chmod(outName, mode);
+ /* Copy the string to the field. */
+ memcpy (cp, tempString, len);
- outFd = -1;
- }
+ return TRUE;
}
-
-/*
- * See if the specified file name belongs to one of the specified list
- * of path prefixes. An empty list implies that all files are wanted.
- * Returns TRUE if the file is selected.
- */
+/* Write out a tar header for the specified file/directory/whatever */
static int
-wantFileName(const char *fileName, int argc, char **argv)
+writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
+ const char *real_name, struct stat *statbuf)
{
- const char *pathName;
- int fileLength;
- int pathLength;
-
- /*
- * If there are no files in the list, then the file is wanted.
- */
- if (argc == 0)
- return TRUE;
-
- fileLength = strlen(fileName);
-
- /*
- * Check each of the test paths.
- */
- while (argc-- > 0) {
- pathName = *argv++;
-
- pathLength = strlen(pathName);
+ long chksum=0;
+ struct TarHeader header;
+ const unsigned char *cp = (const unsigned char *) &header;
+ ssize_t size = sizeof(struct TarHeader);
+
+ memset( &header, 0, size);
- if (fileLength < pathLength)
- continue;
-
- if (memcmp(fileName, pathName, pathLength) != 0)
- continue;
+ strncpy(header.name, header_name, sizeof(header.name));
- if ((fileLength == pathLength) || (fileName[pathLength] == '/')) {
- return TRUE;
+ putOctal(header.mode, sizeof(header.mode), statbuf->st_mode);
+ putOctal(header.uid, sizeof(header.uid), statbuf->st_uid);
+ putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
+ putOctal(header.size, sizeof(header.size), 0); /* Regular file size is handled later */
+ putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime);
+ strncpy(header.magic, TAR_MAGIC TAR_VERSION,
+ TAR_MAGIC_LEN + TAR_VERSION_LEN );
+
+ /* Enter the user and group names (default to root if it fails) */
+ my_getpwuid(header.uname, statbuf->st_uid);
+ if (! *header.uname)
+ strcpy(header.uname, "root");
+ my_getgrgid(header.gname, statbuf->st_gid);
+ if (! *header.uname)
+ strcpy(header.uname, "root");
+
+ if (tbInfo->hlInfo) {
+ /* This is a hard link */
+ 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);
+ return ( FALSE);
}
+ buffer[link_size] = '\0';
+ strncpy(header.linkname, buffer, sizeof(header.linkname));
+ } else if (S_ISDIR(statbuf->st_mode)) {
+ header.typeflag = DIRTYPE;
+ strncat(header.name, "/", sizeof(header.name));
+ } else if (S_ISCHR(statbuf->st_mode)) {
+ header.typeflag = CHRTYPE;
+ putOctal(header.devmajor, sizeof(header.devmajor), MAJOR(statbuf->st_rdev));
+ putOctal(header.devminor, sizeof(header.devminor), MINOR(statbuf->st_rdev));
+ } else if (S_ISBLK(statbuf->st_mode)) {
+ header.typeflag = BLKTYPE;
+ putOctal(header.devmajor, sizeof(header.devmajor), MAJOR(statbuf->st_rdev));
+ putOctal(header.devminor, sizeof(header.devminor), MINOR(statbuf->st_rdev));
+ } else if (S_ISFIFO(statbuf->st_mode)) {
+ header.typeflag = FIFOTYPE;
+ } else if (S_ISREG(statbuf->st_mode)) {
+ header.typeflag = REGTYPE;
+ putOctal(header.size, sizeof(header.size), statbuf->st_size);
+ } else {
+ error_msg("%s: Unknown file type", real_name);
+ return ( FALSE);
}
- return FALSE;
-}
-
-
-/* From here to the end of the file is the tar writing stuff.
- * If you do not have BB_FEATURE_TAR_CREATE defined, this will
- * not be built.
- * */
-#ifdef BB_FEATURE_TAR_CREATE
-
-/*
- * Write a tar file containing the specified files.
- */
-static void writeTarFile(int argc, char **argv)
-{
- struct stat statbuf;
-
- /*
- * Make sure there is at least one file specified.
- */
- if (argc <= 0) {
- fprintf(stderr, "No files specified to be saved\n");
- errorFlag = TRUE;
- }
-
- /*
- * Create the tar file for writing.
- */
- if ((tarName == NULL) || !strcmp(tarName, "-")) {
- tostdoutFlag = TRUE;
- tarFd = fileno(stdout);
- } else
- tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-
- if (tarFd < 0) {
- perror(tarName);
- errorFlag = TRUE;
- return;
+ /* 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
+ * digits, followed by a null like the other fields... */
+ memset(header.chksum, ' ', sizeof(header.chksum));
+ cp = (const unsigned char *) &header;
+ while (size-- > 0)
+ chksum += *cp++;
+ putOctal(header.chksum, 7, chksum);
+
+ /* Now write the header out to disk */
+ if ((size=full_write(tbInfo->tarFd, (char*)&header, sizeof(struct TarHeader))) < 0) {
+ error_msg(io_error, real_name, strerror(errno));
+ return ( FALSE);
}
-
- /*
- * Get the device and inode of the tar file for checking later.
- */
- if (fstat(tarFd, &statbuf) < 0) {
- perror(tarName);
- errorFlag = TRUE;
- goto done;
+ /* Pad the header up to the tar block size */
+ for (; size<TAR_BLOCK_SIZE; size++) {
+ write(tbInfo->tarFd, "\0", 1);
}
-
- tarDev = statbuf.st_dev;
- tarInode = statbuf.st_ino;
-
- /*
- * Append each file name into the archive file.
- * Follow symbolic links for these top level file names.
- */
- while (errorFlag == FALSE && (argc-- > 0)) {
- saveFile(*argv++, FALSE);
+ /* Now do the verbose thing (or not) */
+ if (tbInfo->verboseFlag==TRUE) {
+ FILE *vbFd = stdout;
+ if (tbInfo->tarFd == fileno(stdout)) // If the archive goes to stdout, verbose to stderr
+ vbFd = stderr;
+ fprintf(vbFd, "%s\n", header.name);
}
- /*
- * Now write an empty block of zeroes to end the archive.
- */
- writeTarBlock("", 1);
-
-
- done:
- /*
- * Close the tar file and check for errors if it was opened.
- */
- if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close(tarFd) < 0))
- perror(tarName);
+ return ( TRUE);
}
-/*
- * Save one file into the tar file.
- * If the file is a directory, then this will recursively save all of
- * the files and directories within the directory. The seeLinks
- * flag indicates whether or not we want to see symbolic links as
- * they really are, instead of blindly following them.
- */
-static void saveFile(const char *fileName, int seeLinks)
-{
- int status;
- struct stat statbuf;
-
- if (verboseFlag == TRUE)
- printf("a %s\n", fileName);
- /*
- * Check that the file name will fit in the header.
- */
- if (strlen(fileName) >= TAR_NAME_SIZE) {
- fprintf(stderr, "%s: File name is too long\n", fileName);
-
- return;
+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.
+ ** If so -
+ ** Treat the first occurance of a given dev/inode as a file while
+ ** treating any additional occurances as hard links. This is done
+ ** by adding the file information to the HardLinkInfo linked list.
+ */
+ tbInfo->hlInfo = NULL;
+ if (statbuf->st_nlink > 1) {
+ tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf->st_dev,
+ statbuf->st_ino);
+ if (tbInfo->hlInfo == NULL)
+ addHardLinkInfo (&tbInfo->hlInfoHead, statbuf->st_dev,
+ statbuf->st_ino, statbuf->st_nlink, fileName);
}
- /*
- * Find out about the file.
- */
-#ifdef S_ISLNK
- if (seeLinks == TRUE)
- status = lstat(fileName, &statbuf);
- else
-#endif
- status = stat(fileName, &statbuf);
-
- if (status < 0) {
- perror(fileName);
-
- return;
+ /* It is against the rules to archive a socket */
+ if (S_ISSOCK(statbuf->st_mode)) {
+ error_msg("%s: socket ignored", fileName);
+ return( TRUE);
}
- /*
- * Make sure we aren't trying to save our file into itself.
- */
- if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) {
- fprintf(stderr, "Skipping saving of archive file itself\n");
-
- return;
+ /* It is a bad idea to store the archive we are in the process of creating,
+ * so check the device and inode to be sure that this particular file isn't
+ * 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", fileName);
+ return( TRUE);
}
- /*
- * Check the type of file.
- */
- mode = statbuf.st_mode;
-
- if (S_ISDIR(mode)) {
- saveDirectory(fileName, &statbuf);
-
- return;
+ 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 (S_ISREG(mode)) {
- saveRegularFile(fileName, &statbuf);
- return;
+ if (strlen(fileName) >= NAME_SIZE) {
+ error_msg(name_longer_than_foo, NAME_SIZE);
+ return ( TRUE);
}
- /* Some day add support for tarring these up... but not today. :) */
-// if (S_ISLNK(mode) || S_ISFIFO(mode) || S_ISBLK(mode) || S_ISCHR (mode) ) {
-// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName);
-// }
-
- /*
- * The file is a strange type of file, ignore it.
- */
- fprintf(stderr, "%s: not a directory or regular file\n", fileName);
-}
-
-
-/*
- * Save a regular file to the tar file.
- */
-static void
-saveRegularFile(const char *fileName, const struct stat *statbuf)
-{
- int sawEof;
- int fileFd;
- int cc;
- int dataCount;
- long fullDataCount;
- char data[TAR_BLOCK_SIZE * 16];
-
- /*
- * Open the file for reading.
- */
- fileFd = open(fileName, O_RDONLY);
-
- if (fileFd < 0) {
- perror(fileName);
+ if (header_name[0] == '\0')
+ return TRUE;
- return;
+#if defined BB_FEATURE_TAR_EXCLUDE
+ if (exclude_file(tbInfo->excludeList, header_name)) {
+ return SKIP;
}
+#endif
- /*
- * Write out the header for the file.
- */
- writeHeader(fileName, statbuf);
-
- /*
- * Write the data blocks of the file.
- * We must be careful to write the amount of data that the stat
- * buffer indicated, even if the file has changed size. Otherwise
- * the tar file will be incorrect.
- */
- fullDataCount = statbuf->st_size;
- sawEof = FALSE;
-
- while (fullDataCount > 0) {
- /*
- * Get the amount to write this iteration which is
- * the minumum of the amount left to write and the
- * buffer size.
- */
- dataCount = sizeof(data);
-
- if (dataCount > fullDataCount)
- dataCount = (int) fullDataCount;
-
- /*
- * Read the data from the file if we haven't seen the
- * end of file yet.
- */
- cc = 0;
-
- if (sawEof == FALSE) {
- cc = fullRead(fileFd, data, dataCount);
-
- if (cc < 0) {
- perror(fileName);
-
- (void) close(fileFd);
- errorFlag = TRUE;
-
- return;
- }
-
- /*
- * If the file ended too soon, complain and set
- * a flag so we will zero fill the rest of it.
- */
- if (cc < dataCount) {
- fprintf(stderr, "%s: Short read - zero filling", fileName);
+ if (writeTarHeader(tbInfo, header_name, fileName, statbuf)==FALSE) {
+ return( FALSE);
+ }
- sawEof = TRUE;
+ /* Now, if the file is a regular file, copy it out to the tarball */
+ if ((tbInfo->hlInfo == NULL)
+ && (S_ISREG(statbuf->st_mode))) {
+ int inputFileFd;
+ char buffer[BUFSIZ];
+ ssize_t size=0, readSize=0;
+
+ /* 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", fileName, strerror(errno));
+ return( FALSE);
+ }
+
+ /* write the file to the archive */
+ while ( (size = full_read(inputFileFd, buffer, sizeof(buffer))) > 0 ) {
+ if (full_write(tbInfo->tarFd, buffer, size) != size ) {
+ /* Output file seems to have a problem */
+ error_msg(io_error, fileName, strerror(errno));
+ return( FALSE);
}
+ readSize+=size;
}
-
- /*
- * Zero fill the rest of the data if necessary.
- */
- if (cc < dataCount)
- memset(data + cc, 0, dataCount - cc);
-
- /*
- * Write the buffer to the TAR file.
- */
- writeTarBlock(data, dataCount);
-
- fullDataCount -= dataCount;
+ if (size == -1) {
+ error_msg(io_error, fileName, strerror(errno));
+ return( FALSE);
+ }
+ /* Pad the file up to the tar block size */
+ for (; (readSize%TAR_BLOCK_SIZE) != 0; readSize++) {
+ write(tbInfo->tarFd, "\0", 1);
+ }
+ close( inputFileFd);
}
- /*
- * Close the file.
- */
- if ((tostdoutFlag == FALSE) && close(fileFd) < 0)
- fprintf(stderr, "%s: close: %s\n", fileName, strerror(errno));
+ return( TRUE);
}
-
-/*
- * Save a directory and all of its files to the tar file.
- */
-static void saveDirectory(const char *dirName, const struct stat *statbuf)
+static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
+ char** excludeList)
{
- DIR *dir;
- struct dirent *entry;
- int needSlash;
- char fullName[PATH_MAX + 1];
-
- /*
- * Construct the directory name as used in the tar file by appending
- * a slash character to it.
- */
- strcpy(fullName, dirName);
- strcat(fullName, "/");
-
- /*
- * Write out the header for the directory entry.
- */
- writeHeader(fullName, statbuf);
-
- /*
- * Open the directory.
- */
- dir = opendir(dirName);
+ int tarFd=-1;
+ int errorFlag=FALSE;
+ ssize_t size;
+ struct TarBallInfo tbInfo;
+ tbInfo.verboseFlag = verboseFlag;
+ tbInfo.hlInfoHead = NULL;
- if (dir == NULL) {
- fprintf(stderr, "Cannot read directory \"%s\": %s\n",
- dirName, strerror(errno));
+ /* 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");
- return;
+ /* Open the tar file for writing. */
+ if (!strcmp(tarName, "-"))
+ tbInfo.tarFd = fileno(stdout);
+ else
+ tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+ if (tbInfo.tarFd < 0) {
+ perror_msg( "Error opening '%s'", tarName);
+ freeHardLinkInfo(&tbInfo.hlInfoHead);
+ return ( FALSE);
}
+ tbInfo.excludeList=excludeList;
+ /* Store the stat info for the tarball's file, so
+ * can avoid including the tarball into itself.... */
+ if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0)
+ error_msg_and_die(io_error, tarName, strerror(errno));
- /*
- * See if a slash is needed.
- */
- needSlash = (*dirName && (dirName[strlen(dirName) - 1] != '/'));
+ /* Set the umask for this process so it doesn't
+ * screw up permission setting for us later. */
+ umask(0);
- /*
- * Read all of the directory entries and check them,
- * except for the current and parent directory entries.
- */
- while (errorFlag == FALSE && ((entry = readdir(dir)) != NULL)) {
- if ((strcmp(entry->d_name, ".") == 0) ||
- (strcmp(entry->d_name, "..") == 0)) {
- continue;
+ /* Read the directory/files and iterate over them one at a time */
+ while (*argv != NULL) {
+ if (recursive_action(*argv++, TRUE, FALSE, FALSE,
+ writeFileToTarball, writeFileToTarball,
+ (void*) &tbInfo) == FALSE) {
+ errorFlag = TRUE;
}
-
- /*
- * Build the full path name to the file.
- */
- strcpy(fullName, dirName);
-
- if (needSlash)
- strcat(fullName, "/");
-
- strcat(fullName, entry->d_name);
-
- /*
- * Write this file to the tar file, noticing whether or not
- * the file is a symbolic link.
- */
- saveFile(fullName, TRUE);
}
-
- /*
- * All done, close the directory.
- */
- closedir(dir);
-}
-
-
-/*
- * Write a tar header for the specified file name and status.
- * It is assumed that the file name fits.
- */
-static void writeHeader(const char *fileName, const struct stat *statbuf)
-{
- long checkSum;
- const unsigned char *cp;
- int len;
- TarHeader header;
-
- /*
- * Zero the header block in preparation for filling it in.
- */
- memset((char *) &header, 0, sizeof(header));
-
- /*
- * Fill in the header.
- */
- strcpy(header.name, fileName);
-
- strncpy(header.magic, TAR_MAGIC, sizeof(header.magic));
- strncpy(header.version, TAR_VERSION, sizeof(header.version));
-
- putOctal(header.mode, sizeof(header.mode), statbuf->st_mode & 0777);
- putOctal(header.uid, sizeof(header.uid), statbuf->st_uid);
- putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
- putOctal(header.size, sizeof(header.size), statbuf->st_size);
- putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime);
-
- header.typeFlag = TAR_TYPE_REGULAR;
-
- /*
- * Calculate and store the checksum.
- * This is the sum of all of the bytes of the header,
- * with the checksum field itself treated as blanks.
- */
- memset(header.checkSum, ' ', sizeof(header.checkSum));
-
- cp = (const unsigned char *) &header;
- len = sizeof(header);
- checkSum = 0;
-
- while (len-- > 0)
- checkSum += *cp++;
-
- putOctal(header.checkSum, sizeof(header.checkSum), checkSum);
-
- /*
- * Write the tar header.
- */
- writeTarBlock((const char *) &header, sizeof(header));
-}
-
-
-/*
- * Write data to one or more blocks of the tar file.
- * The data is always padded out to a multiple of TAR_BLOCK_SIZE.
- * The errorFlag static variable is set on an error.
- */
-static void writeTarBlock(const char *buf, int len)
-{
- int partialLength;
- int completeLength;
- char fullBlock[TAR_BLOCK_SIZE];
-
- /*
- * If we had a write error before, then do nothing more.
- */
- if (errorFlag == TRUE)
- return;
-
- /*
- * Get the amount of complete and partial blocks.
- */
- partialLength = len % TAR_BLOCK_SIZE;
- completeLength = len - partialLength;
-
- /*
- * Write all of the complete blocks.
- */
- if ((completeLength > 0) && !fullWrite(tarFd, buf, completeLength)) {
- perror(tarName);
-
- errorFlag = TRUE;
-
- return;
+ /* Write two empty blocks to the end of the archive */
+ for (size=0; size<(2*TAR_BLOCK_SIZE); size++) {
+ write(tbInfo.tarFd, "\0", 1);
}
- /*
- * If there are no partial blocks left, we are done.
- */
- if (partialLength == 0)
- return;
-
- /*
- * Copy the partial data into a complete block, and pad the rest
- * of it with zeroes.
- */
- memcpy(fullBlock, buf + completeLength, partialLength);
- memset(fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength);
-
- /*
- * Write the last complete block.
- */
- if (!fullWrite(tarFd, fullBlock, TAR_BLOCK_SIZE)) {
- perror(tarName);
+ /* To be pedantically correct, we would check if the tarball
+ * 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 */
- errorFlag = TRUE;
+ /* Hang up the tools, close up shop, head home */
+ close(tarFd);
+ if (errorFlag == TRUE) {
+ error_msg("Error exit delayed from previous errors");
+ freeHardLinkInfo(&tbInfo.hlInfoHead);
+ return(FALSE);
}
+ freeHardLinkInfo(&tbInfo.hlInfoHead);
+ return( TRUE);
}
-/*
- * Put an octal string into the specified buffer.
- * The number is zero and space padded and possibly null padded.
- * Returns TRUE if successful.
- */
-static int putOctal(char *cp, int len, long value)
-{
- int tempLength;
- char *tempString;
- char tempBuffer[32];
-
- /*
- * Create a string of the specified length with an initial space,
- * leading zeroes and the octal number, and a trailing null.
- */
- tempString = tempBuffer;
-
- sprintf(tempString, " %0*lo", len - 2, value);
-
- tempLength = strlen(tempString) + 1;
-
- /*
- * If the string is too large, suppress the leading space.
- */
- if (tempLength > len) {
- tempLength--;
- tempString++;
- }
-
- /*
- * If the string is still too large, suppress the trailing null.
- */
- if (tempLength > len)
- tempLength--;
-
- /*
- * If the string is still too large, fail.
- */
- if (tempLength > len)
- return FALSE;
-
- /*
- * Copy the string to the field.
- */
- memcpy(cp, tempString, len);
-
- return TRUE;
-}
#endif
-/* END CODE */
-#endif
projects / oweals / busybox.git / blobdiff