/[magellan-source]/trunk/mkinitrd-magellan/busybox/archival/tar.c

Diff of /trunk/mkinitrd-magellan/busybox/archival/tar.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 26
  #include <fnmatch.h>
  #include "libbb.h"
  #include "unarchive.h"
  /* FIXME: Stop using this non-standard feature */
  #ifndef FNM_LEADING_DIR
- #define FNM_LEADING_DIR 0
+ # define FNM_LEADING_DIR 0
  #endif
+ //#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+ #define DBG(...) ((void)0)
  #define block_buf bb_common_bufsiz1
-Line 52
+Line 55
  /* POSIX tar Header Block, from POSIX 1003.1-1990  */
  #define NAME_SIZE      100
  #define NAME_SIZE_STR "100"
- typedef struct TarHeader TarHeader;
+ typedef struct TarHeader {       /* byte offset */
- struct TarHeader {		  /* byte offset */
  	char name[NAME_SIZE];     /*   0-99 */
  	char mode[8];             /* 100-107 */
  	char uid[8];              /* 108-115 */
-Line 75 
 struct TarHeader {		  /* byte offset */
+Line 77 
 struct TarHeader {		  /* byte offset */
  	char devminor[8];         /* 337-344 */
  	char prefix[155];         /* 345-499 */
  	char padding[12];         /* 500-512 (pad to exactly TAR_BLOCK_SIZE) */
- };
+ } TarHeader;
  /*
  ** 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;
+ typedef struct HardLinkInfo {
- struct HardLinkInfo {
+ 	struct HardLinkInfo *next; /* Next entry in list */
- 	HardLinkInfo *next;     /* Next entry in list */
+ 	dev_t dev;                 /* Device number */
- 	dev_t dev;              /* Device number */
+ 	ino_t ino;                 /* Inode number */
- 	ino_t ino;              /* Inode number */
+ //	short linkCount;           /* (Hard) Link Count */
- 	short linkCount;        /* (Hard) Link Count */
+ 	char name[1];              /* Start of filename (must be last) */
- 	char name[1];           /* Start of filename (must be last) */
+ } HardLinkInfo;
- };
  /* Some info to be carried along when creating a new tarball */
- typedef struct TarBallInfo TarBallInfo;
+ typedef struct TarBallInfo {
- struct TarBallInfo {
  	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 */
- };
+ //TODO: save only st_dev + st_ino
+ 	struct stat tarFileStatBuf;     /* 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 */
+ } TarBallInfo;
  /* A nice enum with all the possible tar file content types */
- enum TarFileType {
+ enum {
  	REGTYPE = '0',		/* regular file */
  	REGTYPE0 = '\0',	/* regular file (ancient bug compat) */
  	LNKTYPE = '1',		/* hard link */
-Line 120 
 enum TarFileType {
+Line 121 
 enum TarFileType {
  	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,
 Line 135 
 static void addHardLinkInfo(HardLinkInfo
  	*hlInfoHeadPtr = hlInfo;
  	hlInfo->dev = statbuf->st_dev;
  	hlInfo->ino = statbuf->st_ino;
- 	hlInfo->linkCount = statbuf->st_nlink;
+ //	hlInfo->linkCount = statbuf->st_nlink;
  	strcpy(hlInfo->name, fileName);
  }
 Line 155 
 static void freeHardLinkInfo(HardLinkInf
  	}
  }
- /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
+ /* Might be faster (and bigger) if the dev/ino were stored in numeric order ;) */
  static HardLinkInfo *findHardLinkInfo(HardLinkInfo *hlInfo, struct stat *statbuf)
  {
  	while (hlInfo) {
- 		if ((statbuf->st_ino == hlInfo->ino) && (statbuf->st_dev == hlInfo->dev))
+ 		if (statbuf->st_ino == hlInfo->ino
+ 		 && statbuf->st_dev == hlInfo->dev
+ 		) {
+ 			DBG("found hardlink:'%s'", hlInfo->name);
  			break;
+ 		}
  		hlInfo = hlInfo->next;
  	}
  	return hlInfo;
-Line 171 
 static HardLinkInfo *findHardLinkInfo(Ha
+Line 175 
 static HardLinkInfo *findHardLinkInfo(Ha
   * Stores low-order bits only if whole value does not fit. */
  static void putOctal(char *cp, int len, off_t value)
  {
- 	char tempBuffer[sizeof(off_t)*3+1];
+ 	char tempBuffer[sizeof(off_t)*3 + 1];
  	char *tempString = tempBuffer;
  	int width;
-Line 331 
 static int writeTarHeader(struct TarBall
+Line 335 
 static int writeTarHeader(struct TarBall
  		if (sizeof(statbuf->st_size) > 4
  		 && statbuf->st_size > (off_t)0777777777777LL
  		) {
- 			bb_error_msg_and_die("cannot store file '%s' "
+ 			bb_error_msg_and_die("can't store file '%s' "
- 				"of size %"OFF_FMT"d, aborting",
+ 				"of size %"OFF_FMT"u, aborting",
  				fileName, statbuf->st_size);
  		}
  		header.typeflag = REGTYPE;
-Line 357 
 static int writeTarHeader(struct TarBall
+Line 361 
 static int writeTarHeader(struct TarBall
  	if (tbInfo->verboseFlag) {
  		FILE *vbFd = stdout;
- 		if (tbInfo->tarFd == STDOUT_FILENO)	/* If the archive goes to stdout, verbose to stderr */
+ 		/* If archive goes to stdout, verbose goes to stderr */
+ 		if (tbInfo->tarFd == STDOUT_FILENO)
  			vbFd = stderr;
  		/* GNU "tar cvvf" prints "extended" listing a-la "ls -l" */
  		/* We don't have such excesses here: for us "v" == "vv" */
-Line 375 
 static int exclude_file(const llist_t *e
+Line 380 
 static int exclude_file(const llist_t *e
  	while (excluded_files) {
  		if (excluded_files->data[0] == '/') {
  			if (fnmatch(excluded_files->data, file,
- 						FNM_PATHNAME | FNM_LEADING_DIR) == 0)
+ 					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] != '/' &&
+ 				if ((p == file || p[-1] == '/')
- 					fnmatch(excluded_files->data, p,
+ 				 && p[0] != '/'
- 							FNM_PATHNAME | FNM_LEADING_DIR) == 0)
+ 				 && fnmatch(excluded_files->data, p,
+ 						FNM_PATHNAME | FNM_LEADING_DIR) == 0
+ 				) {
  					return 1;
+ 				}
  			}
  		}
  		excluded_files = excluded_files->link;
-Line 393 
 static int exclude_file(const llist_t *e
+Line 401 
 static int exclude_file(const llist_t *e
  	return 0;
  }
  #else
- #define exclude_file(excluded_files, file) 0
+ # define exclude_file(excluded_files, file) 0
  #endif
  static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
-Line 403 
 static int FAST_FUNC writeFileToTarball(
+Line 411 
 static int FAST_FUNC writeFileToTarball(
  	const char *header_name;
  	int inputFileFd = -1;
+ 	DBG("writeFileToTarball('%s')", fileName);
  	/* Strip leading '/' (must be before memorizing hardlink's name) */
  	header_name = fileName;
  	while (header_name[0] == '/') {
-Line 432 
 static int FAST_FUNC writeFileToTarball(
+Line 442 
 static int FAST_FUNC writeFileToTarball(
  	 * by adding the file information to the HardLinkInfo linked list.
  	 */
  	tbInfo->hlInfo = NULL;
- 	if (statbuf->st_nlink > 1) {
+ 	if (!S_ISDIR(statbuf->st_mode) && statbuf->st_nlink > 1) {
+ 		DBG("'%s': st_nlink > 1", header_name);
  		tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf);
- 		if (tbInfo->hlInfo == NULL)
+ 		if (tbInfo->hlInfo == NULL) {
+ 			DBG("'%s': addHardLinkInfo", header_name);
  			addHardLinkInfo(&tbInfo->hlInfoHead, statbuf, header_name);
+ 		}
  	}
  	/* 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
+ 	if (tbInfo->tarFileStatBuf.st_dev == statbuf->st_dev
- 	 && tbInfo->statBuf.st_ino == statbuf->st_ino
+ 	 && tbInfo->tarFileStatBuf.st_ino == statbuf->st_ino
  	) {
  		bb_error_msg("%s: file is the archive; skipping", fileName);
  		return TRUE;
-Line 504 
 static int FAST_FUNC writeFileToTarball(
+Line 517 
 static int FAST_FUNC writeFileToTarball(
  }
  #if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
- #if !(ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2)
+ # if !(ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2)
- #define vfork_compressor(tar_fd, gzip) vfork_compressor(tar_fd)
+ #  define vfork_compressor(tar_fd, gzip) vfork_compressor(tar_fd)
- #endif
+ # endif
  /* Don't inline: vfork scares gcc and pessimizes code */
  static void NOINLINE vfork_compressor(int tar_fd, int gzip)
  {
  	pid_t gzipPid;
- #if ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2
+ # if ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2
  	const char *zip_exec = (gzip == 1) ? "gzip" : "bzip2";
- #elif ENABLE_FEATURE_SEAMLESS_GZ
+ # elif ENABLE_FEATURE_SEAMLESS_GZ
  	const char *zip_exec = "gzip";
- #else /* only ENABLE_FEATURE_SEAMLESS_BZ2 */
+ # else /* only ENABLE_FEATURE_SEAMLESS_BZ2 */
  	const char *zip_exec = "bzip2";
- #endif
+ # endif
  	// On Linux, vfork never unpauses parent early, although standard
  	// allows for that. Do we want to waste bytes checking for it?
- #define WAIT_FOR_CHILD 0
+ # define WAIT_FOR_CHILD 0
  	volatile int vfork_exec_errno = 0;
  	struct fd_pair gzipDataPipe;
- #if WAIT_FOR_CHILD
+ # if WAIT_FOR_CHILD
  	struct fd_pair gzipStatusPipe;
  	xpiped_pair(gzipStatusPipe);
- #endif
+ # endif
  	xpiped_pair(gzipDataPipe);
  	signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
- #if defined(__GNUC__) && __GNUC__
+ # if defined(__GNUC__) && __GNUC__
  	/* Avoid vfork clobbering */
  	(void) &zip_exec;
- #endif
+ # endif
  	gzipPid = vfork();
  	if (gzipPid < 0)
-Line 544 
 static void NOINLINE vfork_compressor(in
+Line 557 
 static void NOINLINE vfork_compressor(in
  		/* child */
  		/* NB: close _first_, then move fds! */
  		close(gzipDataPipe.wr);
- #if WAIT_FOR_CHILD
+ # if WAIT_FOR_CHILD
  		close(gzipStatusPipe.rd);
  		/* gzipStatusPipe.wr will close only on exec -
  		 * parent waits for this close to happen */
  		fcntl(gzipStatusPipe.wr, F_SETFD, FD_CLOEXEC);
- #endif
+ # endif
  		xmove_fd(gzipDataPipe.rd, 0);
  		xmove_fd(tar_fd, 1);
  		/* exec gzip/bzip2 program/applet */
-Line 561 
 static void NOINLINE vfork_compressor(in
+Line 574 
 static void NOINLINE vfork_compressor(in
  	/* parent */
  	xmove_fd(gzipDataPipe.wr, tar_fd);
  	close(gzipDataPipe.rd);
- #if WAIT_FOR_CHILD
+ # if WAIT_FOR_CHILD
  	close(gzipStatusPipe.wr);
  	while (1) {
  		char buf;
-Line 573 
 static void NOINLINE vfork_compressor(in
+Line 586 
 static void NOINLINE vfork_compressor(in
  			continue;	/* try it again */
  	}
  	close(gzipStatusPipe.rd);
- #endif
+ # endif
  	if (vfork_exec_errno) {
  		errno = vfork_exec_errno;
- 		bb_perror_msg_and_die("cannot exec %s", zip_exec);
+ 		bb_perror_msg_and_die("can't execute '%s'", zip_exec);
  	}
  }
  #endif /* ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2 */
-Line 596 
 static NOINLINE int writeTarFile(int tar
+Line 609 
 static NOINLINE int writeTarFile(int tar
  	/* Store the stat info for the tarball's file, so
  	 * can avoid including the tarball into itself....  */
- 	if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0)
+ 	if (fstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf) < 0)
- 		bb_perror_msg_and_die("cannot stat tar file");
+ 		bb_perror_msg_and_die("can't stat tar file");
  #if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
  	if (gzip)
-Line 610 
 static NOINLINE int writeTarFile(int tar
+Line 623 
 static NOINLINE int writeTarFile(int tar
  	while (include) {
  		if (!recursive_action(include->data, ACTION_RECURSE |
  				(dereferenceFlag ? ACTION_FOLLOWLINKS : 0),
- 				writeFileToTarball, writeFileToTarball, &tbInfo, 0))
+ 				writeFileToTarball, writeFileToTarball, &tbInfo, 0)
- 		{
+ 		) {
  			errorFlag = TRUE;
  		}
  		include = include->link;
-Line 674 
 static llist_t *append_file_list_to_list
+Line 687 
 static llist_t *append_file_list_to_list
  	return newlist;
  }
  #else
- #define append_file_list_to_list(x) 0
+ # define append_file_list_to_list(x) 0
  #endif
  #if ENABLE_FEATURE_SEAMLESS_Z
-Line 699 
 static char FAST_FUNC get_header_tar_Z(a
+Line 712 
 static char FAST_FUNC get_header_tar_Z(a
  	return EXIT_FAILURE;
  }
  #else
- #define get_header_tar_Z NULL
+ # define get_header_tar_Z NULL
  #endif
  #ifdef CHECK_FOR_CHILD_EXITCODE
-Line 716 
 static void handle_SIGCHLD(int status)
+Line 729 
 static void handle_SIGCHLD(int status)
  		/* wait failed?! I'm confused... */
  		return;
- 	if (WIFEXITED(status) && WEXITSTATUS(status)==0)
+ 	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
  		/* child exited with 0 */
  		return;
  	/* Cannot happen?
-Line 726 
 static void handle_SIGCHLD(int status)
+Line 739 
 static void handle_SIGCHLD(int status)
  #endif
  enum {
- 	OPTBIT_KEEP_OLD = 7,
+ 	OPTBIT_KEEP_OLD = 8,
- 	USE_FEATURE_TAR_CREATE(   OPTBIT_CREATE      ,)
+ 	IF_FEATURE_TAR_CREATE(   OPTBIT_CREATE      ,)
- 	USE_FEATURE_TAR_CREATE(   OPTBIT_DEREFERENCE ,)
+ 	IF_FEATURE_TAR_CREATE(   OPTBIT_DEREFERENCE ,)
- 	USE_FEATURE_SEAMLESS_BZ2( OPTBIT_BZIP2       ,)
+ 	IF_FEATURE_SEAMLESS_BZ2( OPTBIT_BZIP2       ,)
- 	USE_FEATURE_SEAMLESS_LZMA(OPTBIT_LZMA        ,)
+ 	IF_FEATURE_SEAMLESS_LZMA(OPTBIT_LZMA        ,)
- 	USE_FEATURE_TAR_FROM(     OPTBIT_INCLUDE_FROM,)
+ 	IF_FEATURE_TAR_FROM(     OPTBIT_INCLUDE_FROM,)
- 	USE_FEATURE_TAR_FROM(     OPTBIT_EXCLUDE_FROM,)
+ 	IF_FEATURE_TAR_FROM(     OPTBIT_EXCLUDE_FROM,)
- 	USE_FEATURE_SEAMLESS_GZ(  OPTBIT_GZIP        ,)
+ 	IF_FEATURE_SEAMLESS_GZ(  OPTBIT_GZIP        ,)
- 	USE_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,)
+ 	IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,) // 16th bit
- 	OPTBIT_NOPRESERVE_OWN,
+ 	IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
+ #if ENABLE_FEATURE_TAR_LONG_OPTIONS
+ 	OPTBIT_NUMERIC_OWNER,
  	OPTBIT_NOPRESERVE_PERM,
+ 	OPTBIT_OVERWRITE,
+ #endif
  	OPT_TEST         = 1 << 0, // t
  	OPT_EXTRACT      = 1 << 1, // x
  	OPT_BASEDIR      = 1 << 2, // C
  	OPT_TARNAME      = 1 << 3, // f
  	OPT_2STDOUT      = 1 << 4, // O
- 	OPT_P            = 1 << 5, // p
+ 	OPT_NOPRESERVE_OWNER = 1 << 5, // o == no-same-owner
- 	OPT_VERBOSE      = 1 << 6, // v
+ 	OPT_P            = 1 << 6, // p
- 	OPT_KEEP_OLD     = 1 << 7, // k
+ 	OPT_VERBOSE      = 1 << 7, // v
- 	OPT_CREATE       = USE_FEATURE_TAR_CREATE(   (1 << OPTBIT_CREATE      )) + 0, // c
+ 	OPT_KEEP_OLD     = 1 << 8, // k
- 	OPT_DEREFERENCE  = USE_FEATURE_TAR_CREATE(   (1 << OPTBIT_DEREFERENCE )) + 0, // h
+ 	OPT_CREATE       = IF_FEATURE_TAR_CREATE(   (1 << OPTBIT_CREATE      )) + 0, // c
- 	OPT_BZIP2        = USE_FEATURE_SEAMLESS_BZ2( (1 << OPTBIT_BZIP2       )) + 0, // j
+ 	OPT_DEREFERENCE  = IF_FEATURE_TAR_CREATE(   (1 << OPTBIT_DEREFERENCE )) + 0, // h
- 	OPT_LZMA         = USE_FEATURE_SEAMLESS_LZMA((1 << OPTBIT_LZMA        )) + 0, // a
+ 	OPT_BZIP2        = IF_FEATURE_SEAMLESS_BZ2( (1 << OPTBIT_BZIP2       )) + 0, // j
- 	OPT_INCLUDE_FROM = USE_FEATURE_TAR_FROM(     (1 << OPTBIT_INCLUDE_FROM)) + 0, // T
+ 	OPT_LZMA         = IF_FEATURE_SEAMLESS_LZMA((1 << OPTBIT_LZMA        )) + 0, // a
- 	OPT_EXCLUDE_FROM = USE_FEATURE_TAR_FROM(     (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X
+ 	OPT_INCLUDE_FROM = IF_FEATURE_TAR_FROM(     (1 << OPTBIT_INCLUDE_FROM)) + 0, // T
- 	OPT_GZIP         = USE_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
+ 	OPT_EXCLUDE_FROM = IF_FEATURE_TAR_FROM(     (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X
- 	OPT_COMPRESS     = USE_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
+ 	OPT_GZIP         = IF_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
- 	OPT_NOPRESERVE_OWN  = 1 << OPTBIT_NOPRESERVE_OWN , // no-same-owner
+ 	OPT_COMPRESS     = IF_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
- 	OPT_NOPRESERVE_PERM = 1 << OPTBIT_NOPRESERVE_PERM, // no-same-permissions
+ 	OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
+ 	OPT_NUMERIC_OWNER   = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER  )) + 0, // numeric-owner
+ 	OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
+ 	OPT_OVERWRITE       = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_OVERWRITE      )) + 0, // overwrite
  };
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS
  static const char tar_longopts[] ALIGN1 =
-Line 763 
 static const char tar_longopts[] ALIGN1
+Line 783 
 static const char tar_longopts[] ALIGN1
  	"directory\0"           Required_argument "C"
  	"file\0"                Required_argument "f"
  	"to-stdout\0"           No_argument       "O"
+ 	/* do not restore owner */
+ 	/* Note: GNU tar handles 'o' as no-same-owner only on extract,
+ 	 * on create, 'o' is --old-archive. We do not support --old-archive. */
+ 	"no-same-owner\0"       No_argument       "o"
  	"same-permissions\0"    No_argument       "p"
  	"verbose\0"             No_argument       "v"
  	"keep-old\0"            No_argument       "k"
-Line 786 
 static const char tar_longopts[] ALIGN1
+Line 810 
 static const char tar_longopts[] ALIGN1
  # if ENABLE_FEATURE_SEAMLESS_Z
  	"compress\0"            No_argument       "Z"
  # endif
- 	"no-same-owner\0"       No_argument       "\xfd"
+ # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
- 	"no-same-permissions\0" No_argument       "\xfe"
+ 	"touch\0"               No_argument       "m"
+ # endif
+ 	/* use numeric uid/gid from tar header, not textual */
+ 	"numeric-owner\0"       No_argument       "\xfc"
+ 	/* do not restore mode */
+ 	"no-same-permissions\0" No_argument       "\xfd"
+ 	/* on unpack, open with O_TRUNC and !O_EXCL */
+ 	"overwrite\0"           No_argument       "\xfe"
  	/* --exclude takes next bit position in option mask, */
- 	/* therefore we have to either put it _after_ --no-same-perm */
+ 	/* therefore we have to put it _after_ --no-same-permissions */
- 	/* or add OPT[BIT]_EXCLUDE before OPT[BIT]_NOPRESERVE_OWN */
  # if ENABLE_FEATURE_TAR_FROM
  	"exclude\0"             Required_argument "\xff"
  # endif
-Line 813 
 int tar_main(int argc UNUSED_PARAM, char
+Line 843 
 int tar_main(int argc UNUSED_PARAM, char
  	/* Initialise default values */
  	tar_handle = init_handle();
  	tar_handle->ah_flags = ARCHIVE_CREATE_LEADING_DIRS
- 	                     | ARCHIVE_PRESERVE_DATE
+ 	                     | ARCHIVE_RESTORE_DATE
- 	                     | ARCHIVE_EXTRACT_UNCONDITIONAL;
+ 	                     | ARCHIVE_UNLINK_OLD;
  	/* Apparently only root's tar preserves perms (see bug 3844) */
  	if (getuid() != 0)
- 		tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_PERM;
+ 		tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
  	/* Prepend '-' to the first argument if required */
  	opt_complementary = "--:" // first arg is options
-Line 828 
 int tar_main(int argc UNUSED_PARAM, char
+Line 858 
 int tar_main(int argc UNUSED_PARAM, char
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
  		"\xff::" // cumulative lists for --exclude
  #endif
- 		USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+ 		IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
- 		USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+ 		IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
- 		SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
+ 		IF_NOT_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS
  	applet_long_options = tar_longopts;
  #endif
+ #if ENABLE_DESKTOP
+ 	if (argv[1] && argv[1][0] != '-') {
+ 		/* Compat:
+ 		 * 1st argument without dash handles options with parameters
+ 		 * differently from dashed one: it takes *next argv[i]*
+ 		 * as paramenter even if there are more chars in 1st argument:
+ 		 *  "tar fx TARFILE" - "x" is not taken as f's param
+ 		 *  but is interpreted as -x option
+ 		 *  "tar -xf TARFILE" - dashed equivalent of the above
+ 		 *  "tar -fx ..." - "x" is taken as f's param
+ 		 * getopt32 wouldn't handle 1st command correctly.
+ 		 * Unfortunately, people do use such commands.
+ 		 * We massage argv[1] to work around it by moving 'f'
+ 		 * to the end of the string.
+ 		 * More contrived "tar fCx TARFILE DIR" still fails,
+ 		 * but such commands are much less likely to be used.
+ 		 */
+ 		char *f = strchr(argv[1], 'f');
+ 		if (f) {
+ 			while (f[1] != '\0') {
+ 				*f = f[1];
+ 				f++;
+ 			}
+ 			*f = 'f';
+ 		}
+ 	}
+ #endif
  	opt = getopt32(argv,
- 		"txC:f:Opvk"
+ 		"txC:f:Oopvk"
- 		USE_FEATURE_TAR_CREATE(   "ch"  )
+ 		IF_FEATURE_TAR_CREATE(   "ch"  )
- 		USE_FEATURE_SEAMLESS_BZ2( "j"   )
+ 		IF_FEATURE_SEAMLESS_BZ2( "j"   )
- 		USE_FEATURE_SEAMLESS_LZMA("a"   )
+ 		IF_FEATURE_SEAMLESS_LZMA("a"   )
- 		USE_FEATURE_TAR_FROM(     "T:X:")
+ 		IF_FEATURE_TAR_FROM(     "T:X:")
- 		USE_FEATURE_SEAMLESS_GZ(  "z"   )
+ 		IF_FEATURE_SEAMLESS_GZ(  "z"   )
- 		USE_FEATURE_SEAMLESS_Z(   "Z"   )
+ 		IF_FEATURE_SEAMLESS_Z(   "Z"   )
+ 		IF_FEATURE_TAR_NOPRESERVE_TIME("m")
  		, &base_dir // -C dir
  		, &tar_filename // -f filename
- 		USE_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
+ 		IF_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
- 		USE_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
+ 		IF_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
  		, &excludes // --exclude
  #endif
  		, &verboseFlag // combined count for -t and -v
  		, &verboseFlag // combined count for -t and -v
  		);
+ 	//bb_error_msg("opt:%08x", opt);
  	argv += optind;
  	if (verboseFlag) tar_handle->action_header = header_verbose_list;
-Line 864 
 int tar_main(int argc UNUSED_PARAM, char
+Line 923 
 int tar_main(int argc UNUSED_PARAM, char
  		tar_handle->action_data = data_extract_to_stdout;
  	if (opt & OPT_KEEP_OLD)
- 		tar_handle->ah_flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL;
+ 		tar_handle->ah_flags &= ~ARCHIVE_UNLINK_OLD;
- 	if (opt & OPT_NOPRESERVE_OWN)
+ 	if (opt & OPT_NUMERIC_OWNER)
- 		tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_OWN;
+ 		tar_handle->ah_flags |= ARCHIVE_NUMERIC_OWNER;
+ 	if (opt & OPT_NOPRESERVE_OWNER)
+ 		tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_OWNER;
  	if (opt & OPT_NOPRESERVE_PERM)
- 		tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_PERM;
+ 		tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
+ 	if (opt & OPT_OVERWRITE) {
+ 		tar_handle->ah_flags &= ~ARCHIVE_UNLINK_OLD;
+ 		tar_handle->ah_flags |= ARCHIVE_O_TRUNC;
+ 	}
  	if (opt & OPT_GZIP)
  		get_header_ptr = get_header_tar_gz;
-Line 884 
 int tar_main(int argc UNUSED_PARAM, char
+Line 951 
 int tar_main(int argc UNUSED_PARAM, char
  	if (opt & OPT_COMPRESS)
  		get_header_ptr = get_header_tar_Z;
+ 	if (opt & OPT_NOPRESERVE_TIME)
+ 		tar_handle->ah_flags &= ~ARCHIVE_RESTORE_DATE;
  #if ENABLE_FEATURE_TAR_FROM
  	tar_handle->reject = append_file_list_to_list(tar_handle->reject);
- #if ENABLE_FEATURE_TAR_LONG_OPTIONS
+ # if ENABLE_FEATURE_TAR_LONG_OPTIONS
  	/* Append excludes to reject */
  	while (excludes) {
  		llist_t *next = excludes->link;
-Line 894 
 int tar_main(int argc UNUSED_PARAM, char
+Line 964 
 int tar_main(int argc UNUSED_PARAM, char
  		tar_handle->reject = excludes;
  		excludes = next;
  	}
- #endif
+ # endif
  	tar_handle->accept = append_file_list_to_list(tar_handle->accept);
  #endif
  	/* Setup an array of filenames to work with */
- 	/* TODO: This is the same as in ar, separate function ? */
+ 	/* TODO: This is the same as in ar, make a separate function? */
  	while (*argv) {
  		/* kill trailing '/' unless the string is just "/" */
  		char *cp = last_char_is(*argv, '/');
-Line 914 
 int tar_main(int argc UNUSED_PARAM, char
+Line 984 
 int tar_main(int argc UNUSED_PARAM, char
  	/* Open the tar file */
  	{
- 		FILE *tar_stream;
+ 		int tar_fd = STDIN_FILENO;
- 		int flags;
+ 		int flags = O_RDONLY;
  		if (opt & OPT_CREATE) {
- 			/* Make sure there is at least one file to tar up.  */
+ 			/* Make sure there is at least one file to tar up */
  			if (tar_handle->accept == NULL)
  				bb_error_msg_and_die("empty archive");
- 			tar_stream = stdout;
+ 			tar_fd = STDOUT_FILENO;
  			/* Mimicking GNU tar 1.15.1: */
  			flags = O_WRONLY | O_CREAT | O_TRUNC;
- 		} else {
- 			tar_stream = stdin;
- 			flags = O_RDONLY;
  		}
  		if (LONE_DASH(tar_filename)) {
- 			tar_handle->src_fd = fileno(tar_stream);
+ 			tar_handle->src_fd = tar_fd;
  			tar_handle->seek = seek_by_read;
  		} else {
- 			if (ENABLE_FEATURE_TAR_AUTODETECT
+ 			if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) {
- 			 && get_header_ptr == get_header_tar
+ 				get_header_ptr = get_header_tar;
- 			 && flags == O_RDONLY
- 			) {
  				tar_handle->src_fd = open_zipped(tar_filename);
  				if (tar_handle->src_fd < 0)
  					bb_perror_msg_and_die("can't open '%s'", tar_filename);
-Line 955 
 int tar_main(int argc UNUSED_PARAM, char
+Line 1020 
 int tar_main(int argc UNUSED_PARAM, char
  	signal(SIGCHLD, handle_SIGCHLD);
  #endif
- 	/* create an archive */
+ 	/* Create an archive */
  	if (opt & OPT_CREATE) {
  #if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
  		int zipMode = 0;

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984