X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Ftar.c;h=8074c2d1a909ed1453a2c67151b32669b01a9e37;hb=8f3eb1dbab647e0ceca33f573da68ad3f2aa7086;hp=c18e66fd209b96ac6107e1198294d36f1e4be08a;hpb=837097648e88080239dd279489b482d9bb91e765;p=oweals%2Fbusybox.git

diff --git a/archival/tar.c b/archival/tar.c
index c18e66fd2..8074c2d1a 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -2,12 +2,14 @@
 /*
  * Mini tar implementation for busybox 
  *
+ * Modifed to use common extraction code used by ar, cpio, dpkg-deb, dpkg
+ *  Glenn McGrath <bug1@optushome.com.au>
+ *
  * 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.)
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * Based in part in the tar implementation in sash
  *  Copyright (c) 1999 by David I. Bell
@@ -35,747 +37,58 @@
  *
  */
 
-
-#include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-#include <utime.h>
-#include <sys/types.h>
-#include <sys/sysmacros.h>
 #include <getopt.h>
-#include <fnmatch.h>
-#include <string.h>
+#include <search.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <fnmatch.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include "unarchive.h"
 #include "busybox.h"
 
-/* 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' */
+#ifdef CONFIG_FEATURE_TAR_CREATE
 
-/* POSIX tar Header Block, from POSIX 1003.1-1990  */
-struct TarHeader
-{
-                                /* byte offset */
-	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;
+/* Tar file constants  */
+# define TAR_MAGIC          "ustar"	/* ustar and a null */
+# define TAR_VERSION        "  "	/* Be compatable with GNU tar format */
 
+# ifndef MAJOR
+#  define MAJOR(dev) (((dev)>>8)&0xff)
+#  define MINOR(dev) ((dev)&0xff)
+# endif
 
-/* A few useful constants */
-#define TAR_MAGIC          "ustar"        /* ustar and a null */
-#define TAR_VERSION        "  "           /* Be compatable with GNU tar format */
+static const int 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 
-{
-	REGTYPE  = '0',            /* regular file */
-	REGTYPE0 = '\0',           /* regular file (ancient bug compat)*/
-	LNKTYPE  = '1',            /* hard link */
-	SYMTYPE  = '2',            /* symbolic link */
-	CHRTYPE  = '3',            /* character special */
-	BLKTYPE  = '4',            /* block special */
-	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;
-
-/* This struct ignores magic, non-numeric user name, 
- * non-numeric group name, and the checksum, since
- * these are all ignored by BusyBox tar. */ 
-struct TarInfo
-{
-	int              tarFd;          /* An open file descriptor for reading from the tarball */
-	char *           name;           /* File name */
-	mode_t           mode;           /* Unix mode, including device bits. */
-	uid_t            uid;            /* Numeric UID */
-	gid_t            gid;            /* Numeric GID */
-	size_t           size;           /* Size of file */
-	time_t           mtime;          /* Last-modified time */
-	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(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 }
+/* POSIX tar Header Block, from POSIX 1003.1-1990  */
+enum { NAME_SIZE = 100 };	/* because gcc won't let me use 'static const int' */
+struct TarHeader {		/* byte offset */
+	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) */
 };
-#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;
-	FILE *fileList;
-	char file[256];
-#endif
-#if defined BB_FEATURE_TAR_GZIP
-	FILE *comp_file = NULL;
-	int unzipFlag    = FALSE;
-#endif
-	int listFlag     = FALSE;
-	int extractFlag  = FALSE;
-	int createFlag   = FALSE;
-	int verboseFlag  = FALSE;
-	int tostdoutFlag = FALSE;
-	int status       = FALSE;
-	int opt;
-	pid_t pid;
-
-	if (argc <= 1)
-		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':
-				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 '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.");
-#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");
-#endif
-		status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
-#endif
-	}
-	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) {
-			comp_file = fdopen(tarFd, "r");
-			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");
-}
-					
-static void
-fixUpPermissions(TarInfo *header)
-{
-	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 int
-tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
-{
-	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. */
-		char *dir = dirname (header->name);
-		make_directory (dir, -1, FILEUTILS_RECUR);
-		free (dir);
-		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 int
-tarExtractDirectory(TarInfo *header, int extractFlag, int tostdoutFlag)
-{
-	if (extractFlag==FALSE || tostdoutFlag==TRUE)
-		return( TRUE);
-
-	if (make_directory(header->name, header->mode, FILEUTILS_RECUR) < 0) {
-		return( FALSE);
-	}
-	/* make the final component, just in case it was
-	 * omitted by make_directory() (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 int
-tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
-{
-	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 int
-tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
-{
-	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);
-}
-
-/* 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  = 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  = strtol(rawHeader->devmajor, NULL, 8);
-	header->devminor  = strtol(rawHeader->devminor, NULL, 8);
-
-	/* 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(int tarFd, int extractFlag, int listFlag, 
-		int tostdoutFlag, int verboseFlag, char** extractList,
-		char** excludeList)
-{
-	int status;
-	int errorFlag=FALSE;
-	int skipNextHeaderFlag=FALSE;
-	TarHeader rawHeader;
-	TarInfo header;
-
-	/* 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;
-				error_msg("Bad tar header, skipping");
-				continue;
-			}
-		}
-		if ( *(header.name) == '\0' )
-			continue;
-		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) {
-				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
-					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 (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");
-		}
-
-		/* 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 ) {
-			case REGTYPE:
-			case REGTYPE0:
-				/* If the name ends in a '/' then assume it is
-				 * supposed to be a directory, and fall through */
-				if (!last_char_is(header.name,'/')) {
-					if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE)
-						errorFlag=TRUE;
-					break;
-				}
-			case DIRTYPE:
-				if (tarExtractDirectory( &header, extractFlag, tostdoutFlag)==FALSE)
-					errorFlag=TRUE;
-				break;
-			case LNKTYPE:
-				if (tarExtractHardLink( &header, extractFlag, tostdoutFlag)==FALSE)
-					errorFlag=TRUE;
-				break;
-			case SYMTYPE:
-				if (tarExtractSymLink( &header, extractFlag, tostdoutFlag)==FALSE)
-					errorFlag=TRUE;
-				break;
-			case CHRTYPE:
-			case BLKTYPE:
-			case FIFOTYPE:
-				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 */
-		perror_msg("Error reading tar file");
-		return ( FALSE);
-	}
-	else if (errorFlag==TRUE) {
-		error_msg( "Error exit delayed from previous errors");
-		return( FALSE);
-	} else 
-		return( status);
-
-	/* Stuff to do when we are done */
-endgame:
-	close( tarFd);
-	if ( *(header.name) == '\0' ) {
-		if (errorFlag==TRUE)
-			error_msg( "Error exit delayed from previous errors");
-		else
-			return( TRUE);
-	} 
-	return( FALSE);
-}
-
-
-#ifdef BB_FEATURE_TAR_CREATE
+typedef struct TarHeader TarHeader;
 
 /*
 ** writeTarFile(),  writeFileToTarball(), and writeTarHeader() are
@@ -783,55 +96,64 @@ endgame:
 ** Even these functions use the xxxHardLinkInfo() functions.
 */
 typedef struct HardLinkInfo HardLinkInfo;
-struct HardLinkInfo
-{
-	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) */
+struct HardLinkInfo {
+	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) */
 };
 
 /* 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 */
+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 */
+	const llist_t *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;
 
+/* A nice enum with all the possible tar file content types */
+enum TarFileType {
+	REGTYPE = '0',		/* regular file */
+	REGTYPE0 = '\0',	/* regular file (ancient bug compat) */
+	LNKTYPE = '1',		/* hard link */
+	SYMTYPE = '2',		/* symbolic link */
+	CHRTYPE = '3',		/* character special */
+	BLKTYPE = '4',		/* block special */
+	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;
 
 /* 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)
+static inline void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr,
+					struct stat *statbuf,
+					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);
-	}
-	return;
+	hlInfo = (HardLinkInfo *) xmalloc(sizeof(HardLinkInfo) + strlen(name));
+	hlInfo->next = *hlInfoHeadPtr;
+	*hlInfoHeadPtr = hlInfo;
+	hlInfo->dev = statbuf->st_dev;
+	hlInfo->ino = statbuf->st_ino;
+	hlInfo->linkCount = statbuf->st_nlink;
+	strcpy(hlInfo->name, name);
 }
 
-static void
-freeHardLinkInfo (HardLinkInfo **hlInfoHeadPtr)
+static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr)
 {
 	HardLinkInfo *hlInfo = NULL;
 	HardLinkInfo *hlInfoNext = NULL;
@@ -849,21 +171,20 @@ freeHardLinkInfo (HardLinkInfo **hlInfoHeadPtr)
 }
 
 /* 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)
+static inline HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbuf)
 {
-	while(hlInfo) {
-		if ((ino == hlInfo->ino) && (dev == hlInfo->dev))
+	while (hlInfo) {
+		if ((statbuf->st_ino == hlInfo->ino) && (statbuf->st_dev == hlInfo->dev))
 			break;
 		hlInfo = hlInfo->next;
 	}
-	return(hlInfo);
+	return (hlInfo);
 }
 
 /* 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)
+ * Returns TRUE if successful.  */
+static int putOctal(char *cp, int len, long value)
 {
 	int tempLength;
 	char tempBuffer[32];
@@ -871,10 +192,10 @@ static int putOctal (char *cp, int len, long value)
 
 	/* 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);
+	sprintf(tempString, "%0*lo", len - 1, value);
 
 	/* If the string is too large, suppress the leading space.  */
-	tempLength = strlen (tempString) + 1;
+	tempLength = strlen(tempString) + 1;
 	if (tempLength > len) {
 		tempLength--;
 		tempString++;
@@ -889,71 +210,75 @@ static int putOctal (char *cp, int len, long value)
 		return FALSE;
 
 	/* Copy the string to the field.  */
-	memcpy (cp, tempString, len);
+	memcpy(cp, tempString, len);
 
 	return TRUE;
 }
 
 /* Write out a tar header for the specified file/directory/whatever */
-static int
-writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
-		const char *real_name, struct stat *statbuf)
+static inline int writeTarHeader(struct TarBallInfo *tbInfo,
+								 const char *header_name,
+								 const char *real_name, struct stat *statbuf)
 {
-	long chksum=0;
+	long chksum = 0;
 	struct TarHeader header;
 	const unsigned char *cp = (const unsigned char *) &header;
 	ssize_t size = sizeof(struct TarHeader);
-		
-	memset( &header, 0, size);
 
-	strncpy(header.name, header_name, sizeof(header.name)); 
+	memset(&header, 0, size);
+
+	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);
 	putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
-	putOctal(header.size, sizeof(header.size), 0); /* Regular file size is handled later */
+	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 );
+	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)
+	if (my_getpwuid(header.uname, statbuf->st_uid) == NULL)
 		strcpy(header.uname, "root");
+	if (my_getgrgid(header.gname, statbuf->st_gid) == NULL)
+		strcpy(header.gname, "root");
 
 	if (tbInfo->hlInfo) {
 		/* This is a hard link */
 		header.typeflag = LNKTYPE;
-		strncpy(header.linkname, tbInfo->hlInfo->name, sizeof(header.linkname));
+		strncpy(header.linkname, tbInfo->hlInfo->name,
+				sizeof(header.linkname));
 	} else if (S_ISLNK(statbuf->st_mode)) {
 		char *lpath = xreadlink(real_name);
-		if (!lpath) /* Already printed err msg inside xreadlink() */
-			return ( FALSE);
-		header.typeflag  = SYMTYPE;
-		strncpy(header.linkname, lpath, sizeof(header.linkname)); 
+
+		if (!lpath)		/* Already printed err msg inside xreadlink() */
+			return (FALSE);
+		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 = 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));
+		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));
+		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;
+		header.typeflag = FIFOTYPE;
 	} else if (S_ISREG(statbuf->st_mode)) {
-		header.typeflag  = REGTYPE;
+		header.typeflag = REGTYPE;
 		putOctal(header.size, sizeof(header.size), statbuf->st_size);
 	} else {
-		error_msg("%s: Unknown file type", real_name);
-		return ( FALSE);
+		bb_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
@@ -966,168 +291,240 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
 	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);
+	if ((size =
+		 bb_full_write(tbInfo->tarFd, (char *) &header,
+					sizeof(struct TarHeader))) < 0) {
+		bb_error_msg(bb_msg_io_error, real_name);
+		return (FALSE);
 	}
 	/* Pad the header up to the tar block size */
-	for (; size<TAR_BLOCK_SIZE; size++) {
+	for (; size < TAR_BLOCK_SIZE; size++) {
 		write(tbInfo->tarFd, "\0", 1);
 	}
 	/* Now do the verbose thing (or not) */
-	if (tbInfo->verboseFlag==TRUE) {
+
+	if (tbInfo->verboseFlag) {
 		FILE *vbFd = stdout;
-		if (tbInfo->tarFd == fileno(stdout))	// If the archive goes to stdout, verbose to stderr
+
+		if (tbInfo->tarFd == fileno(stdout))	/* If the archive goes to stdout, verbose to stderr */
 			vbFd = stderr;
+
 		fprintf(vbFd, "%s\n", header.name);
 	}
 
-	return ( TRUE);
+	return (TRUE);
 }
 
+# ifdef CONFIG_FEATURE_TAR_FROM
+static inline int exclude_file(const llist_t *excluded_files, const char *file)
+{
+	while (excluded_files) {
+		if (excluded_files->data[0] == '/') {
+			if (fnmatch(excluded_files->data, 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->data, p,
+							FNM_PATHNAME | FNM_LEADING_DIR) == 0)
+					return 1;
+			}
+		}
+		excluded_files = excluded_files->link;
+	}
+
+	return 0;
+}
+# endif
 
-static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* userData)
+static int writeFileToTarball(const char *fileName, struct stat *statbuf,
+							  void *userData)
 {
-	struct TarBallInfo *tbInfo = (struct TarBallInfo *)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.
-	*/
+	   ** 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);
+		tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf);
 		if (tbInfo->hlInfo == NULL)
-			addHardLinkInfo (&tbInfo->hlInfoHead, statbuf->st_dev,
-					statbuf->st_ino, statbuf->st_nlink, fileName);
+			addHardLinkInfo(&tbInfo->hlInfoHead, statbuf, fileName);
 	}
 
 	/* It is against the rules to archive a socket */
 	if (S_ISSOCK(statbuf->st_mode)) {
-		error_msg("%s: socket ignored", fileName);
-		return( TRUE);
+		bb_error_msg("%s: socket ignored", fileName);
+		return (TRUE);
 	}
 
 	/* 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);
+		tbInfo->statBuf.st_ino == statbuf->st_ino) {
+		bb_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;
+		static int alreadyWarned = FALSE;
+
+		if (alreadyWarned == FALSE) {
+			bb_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);
+		bb_error_msg(bb_msg_name_longer_than_foo, NAME_SIZE);
+		return (TRUE);
 	}
 
 	if (header_name[0] == '\0')
 		return TRUE;
 
-#if defined BB_FEATURE_TAR_EXCLUDE
+# ifdef CONFIG_FEATURE_TAR_FROM
 	if (exclude_file(tbInfo->excludeList, header_name)) {
 		return SKIP;
 	}
-#endif
+# endif							/* CONFIG_FEATURE_TAR_FROM */
 
-	if (writeTarHeader(tbInfo, header_name, fileName, statbuf)==FALSE) {
-		return( FALSE);
-	} 
+	if (writeTarHeader(tbInfo, header_name, fileName, statbuf) == FALSE) {
+		return (FALSE);
+	}
 
 	/* 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;
+		&& (S_ISREG(statbuf->st_mode))) {
+		int inputFileFd;
+		ssize_t 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);
+			bb_perror_msg("%s: Cannot open", fileName);
+			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;
-		}
-		if (size == -1) {
-			error_msg(io_error, fileName, strerror(errno)); 
-			return( FALSE);
-		}
+		readSize = bb_copyfd_eof(inputFileFd, tbInfo->tarFd);
+
 		/* Pad the file up to the tar block size */
-		for (; (readSize%TAR_BLOCK_SIZE) != 0; readSize++) {
+		for (; (readSize % TAR_BLOCK_SIZE) != 0; readSize++) {
 			write(tbInfo->tarFd, "\0", 1);
 		}
-		close( inputFileFd);
+		close(inputFileFd);
 	}
 
-	return( TRUE);
+	return (TRUE);
 }
 
-static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
-		char** excludeList)
+static inline int writeTarFile(const int tar_fd, const int verboseFlag,
+							   const llist_t *include, const llist_t *exclude, const int gzip)
 {
-	int tarFd=-1;
-	int errorFlag=FALSE;
+#ifdef CONFIG_FEATURE_TAR_GZIP
+	int gzipDataPipe[2] = { -1, -1 };
+	int gzipStatusPipe[2] = { -1, -1 };
+	pid_t gzipPid = 0;
+	volatile int vfork_exec_errno = 0;
+#endif
+
+	int errorFlag = FALSE;
 	ssize_t size;
 	struct TarBallInfo tbInfo;
-	tbInfo.verboseFlag = verboseFlag;
+
 	tbInfo.hlInfoHead = NULL;
 
-	/* 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");
-
-	/* 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;
+	fchmod(tar_fd, 0644);
+	tbInfo.tarFd = tar_fd;
+	tbInfo.verboseFlag = verboseFlag;
+
 	/* 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)); 
+		bb_perror_msg_and_die("Couldnt stat tar file");
+
+#ifdef CONFIG_FEATURE_TAR_GZIP
+	if (gzip) {
+		if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) {
+			bb_perror_msg_and_die("Failed to create gzip pipe");
+		}
+
+		signal(SIGPIPE, SIG_IGN);	/* we only want EPIPE on errors */
+
+# if __GNUC__
+			/* Avoid vfork clobbering */
+			(void) &include;
+			(void) &errorFlag;
+# endif
+ 
+		gzipPid = vfork();
+
+		if (gzipPid == 0) {
+			dup2(gzipDataPipe[0], 0);
+			close(gzipDataPipe[1]);
+
+			if (tbInfo.tarFd != 1);
+			dup2(tbInfo.tarFd, 1);
+
+			close(gzipStatusPipe[0]);
+			fcntl(gzipStatusPipe[1], F_SETFD, FD_CLOEXEC);	/* close on exec shows sucess */
+
+			execl("/bin/gzip", "gzip", "-f", 0);
+			vfork_exec_errno = errno;
+
+			close(gzipStatusPipe[1]);
+			exit(-1);
+		} else if (gzipPid > 0) {
+			close(gzipDataPipe[0]);
+			close(gzipStatusPipe[1]);
+
+			while (1) {
+				char buf;
+
+				int n = bb_full_read(gzipStatusPipe[0], &buf, 1);
+
+				if (n == 0 && vfork_exec_errno != 0) {
+					errno = vfork_exec_errno;
+					bb_perror_msg_and_die("Could not exec gzip process");
+				} else if ((n < 0) && (errno == EAGAIN || errno == EINTR))
+					continue;	/* try it again */
+				break;
+			}
+			close(gzipStatusPipe[0]);
+
+			tbInfo.tarFd = gzipDataPipe[1];
+		} else {
+			bb_perror_msg_and_die("Failed to vfork gzip process");
+		}
+	}
+#endif
+
+	tbInfo.excludeList = exclude;
 
 	/* 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) {
+	while (include) {
+		if (!recursive_action(include->data, TRUE, FALSE, FALSE,
+							  writeFileToTarball, writeFileToTarball,
+							  (void *) &tbInfo)) {
 			errorFlag = TRUE;
 		}
+		include = include->link;
 	}
 	/* Write two empty blocks to the end of the archive */
-	for (size=0; size<(2*TAR_BLOCK_SIZE); size++) {
+	for (size = 0; size < (2 * TAR_BLOCK_SIZE); size++) {
 		write(tbInfo.tarFd, "\0", 1);
 	}
 
@@ -1137,16 +534,356 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
 	 * so is considered a waste of space */
 
 	/* 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);
-	}
+	close(tbInfo.tarFd);
+	if (errorFlag)
+		bb_error_msg("Error exit delayed from previous errors");
+
 	freeHardLinkInfo(&tbInfo.hlInfoHead);
-	return( TRUE);
+
+#ifdef CONFIG_FEATURE_TAR_GZIP
+	if (gzip && gzipPid) {
+		if (waitpid(gzipPid, NULL, 0) == -1)
+			printf("Couldnt wait ?");
+	}
+#endif
+
+	return !errorFlag;
 }
+#endif							/* tar_create */
 
+#ifdef CONFIG_FEATURE_TAR_FROM
+static llist_t *append_file_list_to_list(llist_t *list)
+{
+	FILE *src_stream;
+	llist_t *cur = list;
+	llist_t *tmp;
+	char *line;
+	llist_t *newlist = NULL;
+
+	while(cur) {
+		src_stream = bb_xfopen(cur->data, "r");
+		tmp = cur;
+		cur = cur->link;
+		free(tmp);
+	while((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
+			newlist = llist_add_to(newlist, line);
+	}
+	fclose(src_stream);
+	}
+	return newlist;
+}
+#endif
+
+#ifdef CONFIG_FEATURE_TAR_COMPRESS
+static char get_header_tar_Z(archive_handle_t *archive_handle)
+{
+	/* Cant lseek over pipe's */
+	archive_handle->seek = seek_by_char;
+
+	/* do the decompression, and cleanup */
+	if ((bb_xread_char(archive_handle->src_fd) != 0x1f) || (bb_xread_char(archive_handle->src_fd) != 0x9d)) {
+		bb_error_msg_and_die("Invalid magic");
+	}
+
+	archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress);
+	archive_handle->offset = 0;
+	while (get_header_tar(archive_handle) == EXIT_SUCCESS);
+
+	/* Can only do one file at a time */
+	return(EXIT_FAILURE);
+}
+#endif
+
+#define CTX_TEST	(1 << 0)
+#define CTX_EXTRACT	(1 << 1)
+#define TAR_OPT_BASEDIR  (1 << 2)
+#define TAR_OPT_TARNAME  (1 << 3)
+#define TAR_OPT_2STDOUT  (1 << 4)
+#define TAR_OPT_P        (1 << 5)
+#define TAR_OPT_VERBOSE  (1 << 6)
+#define TAR_OPT_KEEP_OLD	(1 << 7)
+
+#ifdef CONFIG_FEATURE_TAR_CREATE
+# define CTX_CREATE	(1 << 8)
+# define TAR_OPT_STR_CREATE	"c"
+# define TAR_OPT_FLAG_CREATE	1
+#else
+//# define CTX_CREATE	0
+# define TAR_OPT_STR_CREATE	""
+# define TAR_OPT_FLAG_CREATE	0
+#endif
+
+#ifdef CONFIG_FEATURE_TAR_BZIP2
+# define TAR_OPT_BZIP2	(1 << (8 + TAR_OPT_FLAG_CREATE)) 
+# define TAR_OPT_STR_BZIP2	"j"
+# define TAR_OPT_FLAG_BZIP2	1
+#else
+# define TAR_OPT_STR_BZIP2	""
+# define TAR_OPT_FLAG_BZIP2	0
+#endif
+
+#ifdef CONFIG_FEATURE_TAR_FROM
+# define TAR_OPT_FROM_FILE	(1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2))
+# define TAR_OPT_EXCLUDE_FROM	(1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + 1))
+# define TAR_OPT_STR_FROM	"T:X:"
+# define TAR_OPT_FLAG_FROM	2
+#else
+# define TAR_OPT_STR_FROM	""
+# define TAR_OPT_FLAG_FROM	0
+#endif
+
+#ifdef CONFIG_FEATURE_TAR_GZIP
+# define TAR_OPT_GZIP	(1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM))
+# define TAR_OPT_STR_GZIP	"z"
+# define TAR_OPT_FLAG_GZIP	1
+#else
+# define TAR_OPT_STR_GZIP	""
+# define TAR_OPT_FLAG_GZIP	0
+#endif
+
+#ifdef CONFIG_FEATURE_TAR_COMPRESS
+# define TAR_OPT_UNCOMPRESS	(1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM + TAR_OPT_FLAG_GZIP))
+# define TAR_OPT_STR_COMPRESS	"Z"
+#else 
+# define TAR_OPT_STR_COMPRESS	""
+#endif
+
+static const char tar_options[]="txC:f:Opvk" \
+	TAR_OPT_STR_CREATE \
+	TAR_OPT_STR_BZIP2 \
+	TAR_OPT_STR_FROM \
+	TAR_OPT_STR_GZIP \
+	TAR_OPT_STR_COMPRESS;
+
+#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
+static const struct option tar_long_options[] = {
+	{ "list",			0,	NULL,	't' },
+	{ "extract",		0,	NULL,	'x' },
+	{ "directory",		1,	NULL,	'C' },
+	{ "file",			1,	NULL,	'f'	},
+	{ "to-stdout",		0,	NULL,	'O' },
+	{ "same-permissions",	0,	NULL,	'p' },
+	{ "verbose",		0,	NULL,	'v' },
+	{ "keep-old",		0,	NULL,	'k' },
+# ifdef CONFIG_FEATURE_TAR_CREATE
+	{ "create",			0,	NULL,	'c' },
+# endif
+# ifdef CONFIG_FEATURE_TAR_BZIP2
+	{ "bzip2",			0,	NULL,	'j' },
+# endif
+# ifdef CONFIG_FEATURE_TAR_FROM
+	{ "from-file",		1,	NULL,	'T' },
+	{ "exclude-from",	1,	NULL,	'X' },
+# endif
+# ifdef CONFIG_FEATURE_TAR_GZIP
+	{ "gzip",			0,	NULL,	'z' },
+# endif
+# ifdef CONFIG_FEATURE_TAR_COMPRESS
+	{ "compress",		0,	NULL,	'Z' },
+# endif
+	{ 0,                 0, 0, 0 }
+};
+#endif
+
+int tar_main(int argc, char **argv)
+{
+	char (*get_header_ptr)(archive_handle_t *) = get_header_tar;
+	archive_handle_t *tar_handle;
+	char *base_dir = NULL;
+	const char *tar_filename = "-";
+	unsigned long opt;
+	unsigned long ctx_flag = 0;
+
+	if (argc < 2) {
+		bb_show_usage();
+	}
+
+	/* Prepend '-' to the first argument if required */
+	if (argv[1][0] != '-') {
+		char *tmp;
+
+		bb_xasprintf(&tmp, "-%s", argv[1]);
+		argv[1] = tmp;
+	}
+
+	/* Initialise default values */
+	tar_handle = init_handle();
+	tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL;
+
+	bb_opt_complementaly = "c~tx:t~cx:x~ct:X*:T*";
+#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
+	bb_applet_long_options = tar_long_options;
+#endif
+
+	opt = bb_getopt_ulflags(argc, argv, tar_options,
+				&base_dir,      /* Change to dir <optarg> */
+				&tar_filename /* archive filename */
+#ifdef CONFIG_FEATURE_TAR_FROM
+				, NULL,
+				&(tar_handle->reject)
+#endif
+				);
+
+	/* Check one and only one context option was given */
+	if(opt & 0x80000000UL) {
+		bb_show_usage();
+	}
+#ifdef CONFIG_FEATURE_TAR_CREATE
+	ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT);
+#else
+	ctx_flag = opt & (CTX_TEST | CTX_EXTRACT);
+#endif
+	if (ctx_flag == 0) {
+		bb_show_usage();
+	}
+	if(ctx_flag & CTX_TEST) {
+		if ((tar_handle->action_header == header_list) || 
+			(tar_handle->action_header == header_verbose_list)) {
+			tar_handle->action_header = header_verbose_list;
+		} else {
+			tar_handle->action_header = header_list;
+		}
+	}
+	if(ctx_flag & CTX_EXTRACT) {
+		if (tar_handle->action_data != data_extract_to_stdout)
+			tar_handle->action_data = data_extract_all;
+		}
+	if(opt & TAR_OPT_2STDOUT) {
+		/* To stdout */
+		tar_handle->action_data = data_extract_to_stdout;
+	}
+	if(opt & TAR_OPT_VERBOSE) {
+		if ((tar_handle->action_header == header_list) || 
+			(tar_handle->action_header == header_verbose_list)) 
+		{
+		tar_handle->action_header = header_verbose_list;
+		} else {
+			tar_handle->action_header = header_list;
+		}
+	}
+	if (opt & TAR_OPT_KEEP_OLD) {
+		tar_handle->flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL;
+	}
+
+#ifdef CONFIG_FEATURE_TAR_GZIP
+	if(opt & TAR_OPT_GZIP) {
+		get_header_ptr = get_header_tar_gz;
+	}
+#endif
+#ifdef CONFIG_FEATURE_TAR_BZIP2
+	if(opt & TAR_OPT_BZIP2) {
+		get_header_ptr = get_header_tar_bz2;
+	}
+#endif
+#ifdef CONFIG_FEATURE_TAR_COMPRESS
+	if(opt & TAR_OPT_UNCOMPRESS) {
+		get_header_ptr = get_header_tar_Z;
+	}
+#endif
+#ifdef CONFIG_FEATURE_TAR_FROM
+	if(opt & TAR_OPT_EXCLUDE_FROM) {
+		tar_handle->reject = append_file_list_to_list(tar_handle->reject);
+	}
+#endif
+
+	/* Check if we are reading from stdin */
+	if ((argv[optind]) && (*argv[optind] == '-')) {
+		/* Default is to read from stdin, so just skip to next arg */
+		optind++;
+	}
+
+	/* Setup an array of filenames to work with */
+	/* TODO: This is the same as in ar, seperate function ? */
+	while (optind < argc) {
+		char *filename_ptr = last_char_is(argv[optind], '/');
+		if (filename_ptr) {
+			*filename_ptr = '\0';
+		}
+		tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
+		optind++;
+	}
+
+	if ((tar_handle->accept) || (tar_handle->reject)) {
+		tar_handle->filter = filter_accept_reject_list;
+	}
 
+	/* Open the tar file */
+	{
+		FILE *tar_stream;
+		int flags;
+
+#ifdef CONFIG_FEATURE_TAR_CREATE
+		if (opt & CTX_CREATE) {
+			/* Make sure there is at least one file to tar up.  */
+			if (tar_handle->accept == NULL) {
+				bb_error_msg_and_die("Cowardly refusing to create an empty archive");
+			}
+			tar_stream = stdout;
+			flags = O_WRONLY | O_CREAT | O_EXCL;
+			unlink(tar_filename);
+		} else
 #endif
+		{
+			tar_stream = stdin;
+			flags = O_RDONLY;
+		}
+
+		if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) {
+			tar_handle->src_fd = fileno(tar_stream);
+			tar_handle->seek = seek_by_char;
+		} else {
+			tar_handle->src_fd = bb_xopen(tar_filename, flags);
+		}
+	}
+
+	if ((base_dir) && (chdir(base_dir))) {
+		bb_perror_msg_and_die("Couldnt chdir to %s", base_dir);
+	}
 
+#ifdef CONFIG_FEATURE_TAR_CREATE
+	/* create an archive */
+	if (opt & CTX_CREATE) {
+		int verboseFlag = FALSE;
+		int gzipFlag = FALSE;
+
+# ifdef CONFIG_FEATURE_TAR_GZIP
+		if (get_header_ptr == get_header_tar_gz) {
+			gzipFlag = TRUE;
+		}
+# endif /* CONFIG_FEATURE_TAR_GZIP */
+# ifdef CONFIG_FEATURE_TAR_BZIP2
+		if (get_header_ptr == get_header_tar_bz2) {
+			bb_error_msg_and_die("Creating bzip2 compressed archives is not currently supported.");
+		}
+# endif /* CONFIG_FEATURE_TAR_BZIP2 */
+
+		if ((tar_handle->action_header == header_list) || 
+				(tar_handle->action_header == header_verbose_list)) {
+			verboseFlag = TRUE;
+		}
+		writeTarFile(tar_handle->src_fd, verboseFlag, tar_handle->accept,
+			tar_handle->reject, gzipFlag);
+	} else 
+#endif /* CONFIG_FEATURE_TAR_CREATE */
+	{
+		while (get_header_ptr(tar_handle) == EXIT_SUCCESS);
+
+		/* Ckeck that every file that should have been extracted was */
+		while (tar_handle->accept) {
+			if (find_list_entry(tar_handle->reject, tar_handle->accept->data) == NULL) {
+				if (find_list_entry(tar_handle->passed, tar_handle->accept->data) == NULL) {
+					bb_error_msg_and_die("%s: Not found in archive\n", tar_handle->accept->data);
+				}
+			}
+			tar_handle->accept = tar_handle->accept->link;
+		}
+	}
+
+#ifdef CONFIG_FEATURE_CLEAN_UP
+	if (tar_handle->src_fd != fileno(stdin)) {
+		close(tar_handle->src_fd);
+	}
+#endif /* CONFIG_FEATURE_CLEAN_UP */
+
+	return(EXIT_SUCCESS);
+}