2000-02-09 01:28:47 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
1999-10-05 21:54:54 +05:30
|
|
|
/*
|
2004-03-15 13:59:22 +05:30
|
|
|
* Mini tar implementation for busybox
|
2000-03-26 19:33:20 +05:30
|
|
|
*
|
2004-04-14 23:21:38 +05:30
|
|
|
* Modified to use common extraction code used by ar, cpio, dpkg-deb, dpkg
|
2007-09-21 18:46:32 +05:30
|
|
|
* by Glenn McGrath
|
2001-10-05 08:28:48 +05:30
|
|
|
*
|
2000-04-13 06:48:56 +05:30
|
|
|
* Note, that as of BusyBox-0.43, tar has been completely rewritten from the
|
2004-04-14 23:21:38 +05:30
|
|
|
* ground up. It still has remnants of the old code lying about, but it is
|
2001-05-24 02:02:09 +05:30
|
|
|
* very different now (i.e., cleaner, less global variables, etc.)
|
1999-10-21 03:38:37 +05:30
|
|
|
*
|
2004-03-15 13:59:22 +05:30
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
1999-11-12 07:00:18 +05:30
|
|
|
*
|
2000-03-26 19:33:20 +05:30
|
|
|
* 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.
|
2010-08-16 23:44:46 +05:30
|
|
|
* Permission to distribute sash derived code under GPL has been granted.
|
2000-03-26 19:33:20 +05:30
|
|
|
*
|
2000-04-05 00:09:50 +05:30
|
|
|
* Based in part on the tar implementation from busybox-0.28
|
2000-03-26 19:33:20 +05:30
|
|
|
* Copyright (C) 1995 Bruce Perens
|
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
1999-10-05 21:54:54 +05:30
|
|
|
*/
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:config TAR
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "tar (39 kb)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: tar is an archiving program. It's commonly used with gzip to
|
|
|
|
//config: create compressed archives. It's probably the most widely used
|
|
|
|
//config: UNIX archive program.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
2017-01-10 19:28:54 +05:30
|
|
|
//config:config FEATURE_TAR_LONG_OPTIONS
|
|
|
|
//config: bool "Enable long options"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR && LONG_OPTS
|
|
|
|
//config:
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:config FEATURE_TAR_CREATE
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Enable -c (archive creation)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR
|
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_AUTODETECT
|
|
|
|
//config: bool "Autodetect compressed tarballs"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ)
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: With this option tar can automatically detect compressed
|
|
|
|
//config: tarballs. Currently it works only on files (not pipes etc).
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_FROM
|
2017-11-13 06:10:28 +05:30
|
|
|
//config: bool "Enable -X (exclude from) and -T (include from) options"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: If you enable this option you'll be able to specify
|
|
|
|
//config: a list of files to include or exclude from an archive.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support old tar header format"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR || DPKG
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This option is required to unpack archives created in
|
|
|
|
//config: the old GNU format; help to kill this old format by
|
|
|
|
//config: repacking your ancient archives with the new format.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_OLDSUN_COMPATIBILITY
|
|
|
|
//config: bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR || DPKG
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: This option is required to unpack archives created by some old
|
|
|
|
//config: version of Sun's tar (it was calculating checksum using signed
|
|
|
|
//config: arithmetic). It is said to be fixed in newer Sun tar, but "old"
|
|
|
|
//config: tarballs still exist.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_GNU_EXTENSIONS
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support GNU tar extensions (long filenames)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR || DPKG
|
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_TO_COMMAND
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support writing to an external program (--to-command)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR && FEATURE_TAR_LONG_OPTIONS
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: If you enable this option you'll be able to instruct tar to send
|
|
|
|
//config: the contents of each extracted file to the standard input of an
|
|
|
|
//config: external program.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_UNAME_GNAME
|
|
|
|
//config: bool "Enable use of user and group names"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable use of user and group names in tar. This affects contents
|
|
|
|
//config: listings (-t) and preserving permissions when unpacking (-p).
|
|
|
|
//config: +200 bytes.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_NOPRESERVE_TIME
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Enable -m (do not preserve time) GNU option"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on TAR
|
|
|
|
//config:
|
|
|
|
//config:config FEATURE_TAR_SELINUX
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support extracting SELinux labels"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default n
|
|
|
|
//config: depends on TAR && SELINUX
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: With this option busybox supports restoring SELinux labels
|
|
|
|
//config: when extracting files from tar archives.
|
2013-11-14 16:09:00 +05:30
|
|
|
|
2013-11-14 14:24:24 +05:30
|
|
|
//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
|
2017-09-18 19:58:43 +05:30
|
|
|
|
2013-11-14 14:23:52 +05:30
|
|
|
//kbuild:lib-$(CONFIG_TAR) += tar.o
|
|
|
|
|
2006-09-10 08:50:37 +05:30
|
|
|
#include <fnmatch.h>
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2016-04-21 19:56:30 +05:30
|
|
|
#include "common_bufsiz.h"
|
2011-09-22 16:15:14 +05:30
|
|
|
#include "bb_archive.h"
|
2008-02-13 22:36:53 +05:30
|
|
|
/* FIXME: Stop using this non-standard feature */
|
|
|
|
#ifndef FNM_LEADING_DIR
|
2009-11-29 12:15:33 +05:30
|
|
|
# define FNM_LEADING_DIR 0
|
2008-02-13 22:36:53 +05:30
|
|
|
#endif
|
|
|
|
|
2015-10-22 04:37:13 +05:30
|
|
|
#if 0
|
|
|
|
# define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
|
|
|
|
#else
|
|
|
|
# define DBG(...) ((void)0)
|
|
|
|
#endif
|
|
|
|
#define DBG_OPTION_PARSING 0
|
2009-11-29 12:15:33 +05:30
|
|
|
|
|
|
|
|
2007-06-04 15:46:52 +05:30
|
|
|
#define block_buf bb_common_bufsiz1
|
2016-04-21 22:08:51 +05:30
|
|
|
#define INIT_G() do { setup_common_bufsiz(); } while (0)
|
2007-06-04 15:46:52 +05:30
|
|
|
|
2008-02-19 16:56:28 +05:30
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_CREATE
|
2001-10-05 08:28:48 +05:30
|
|
|
|
2000-12-07 06:04:58 +05:30
|
|
|
/*
|
2006-11-24 20:25:23 +05:30
|
|
|
** writeTarFile(), writeFileToTarball(), and writeTarHeader() are
|
2000-12-07 06:04:58 +05:30
|
|
|
** the only functions that deal with the HardLinkInfo structure.
|
|
|
|
** Even these functions use the xxxHardLinkInfo() functions.
|
|
|
|
*/
|
2009-11-29 12:15:33 +05:30
|
|
|
typedef struct HardLinkInfo {
|
|
|
|
struct 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) */
|
|
|
|
} HardLinkInfo;
|
2000-12-07 06:04:58 +05:30
|
|
|
|
2000-04-05 00:09:50 +05:30
|
|
|
/* Some info to be carried along when creating a new tarball */
|
2009-11-29 12:15:33 +05:30
|
|
|
typedef struct TarBallInfo {
|
2008-04-22 03:26:07 +05:30
|
|
|
int tarFd; /* Open-for-write file descriptor
|
|
|
|
* for the tarball */
|
|
|
|
int verboseFlag; /* Whether to print extra stuff or not */
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_FROM
|
2008-04-22 03:26:07 +05:30
|
|
|
const llist_t *excludeList; /* List of files to not include */
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2008-04-22 03:26:07 +05:30
|
|
|
HardLinkInfo *hlInfoHead; /* Hard Link Tracking Information */
|
|
|
|
HardLinkInfo *hlInfo; /* Hard Link Info for the current file */
|
2009-11-29 12:15:33 +05:30
|
|
|
//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;
|
2000-04-05 00:09:50 +05:30
|
|
|
|
2001-10-05 08:28:48 +05:30
|
|
|
/* A nice enum with all the possible tar file content types */
|
2009-11-29 12:15:33 +05:30
|
|
|
enum {
|
2002-08-22 19:14:08 +05:30
|
|
|
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 */
|
2001-10-05 08:28:48 +05:30
|
|
|
};
|
2000-04-05 00:09:50 +05:30
|
|
|
|
2000-12-07 06:04:58 +05:30
|
|
|
/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
|
2007-09-05 01:03:22 +05:30
|
|
|
static void addHardLinkInfo(HardLinkInfo **hlInfoHeadPtr,
|
2002-11-26 05:27:27 +05:30
|
|
|
struct stat *statbuf,
|
2006-09-09 18:19:03 +05:30
|
|
|
const char *fileName)
|
2000-12-07 06:04:58 +05:30
|
|
|
{
|
|
|
|
/* Note: hlInfoHeadPtr can never be NULL! */
|
|
|
|
HardLinkInfo *hlInfo;
|
|
|
|
|
2006-09-09 18:19:03 +05:30
|
|
|
hlInfo = xmalloc(sizeof(HardLinkInfo) + strlen(fileName));
|
2002-11-26 05:27:27 +05:30
|
|
|
hlInfo->next = *hlInfoHeadPtr;
|
|
|
|
*hlInfoHeadPtr = hlInfo;
|
|
|
|
hlInfo->dev = statbuf->st_dev;
|
|
|
|
hlInfo->ino = statbuf->st_ino;
|
2009-11-29 12:15:33 +05:30
|
|
|
// hlInfo->linkCount = statbuf->st_nlink;
|
2006-09-09 18:19:03 +05:30
|
|
|
strcpy(hlInfo->name, fileName);
|
2000-12-07 06:04:58 +05:30
|
|
|
}
|
|
|
|
|
2007-09-05 01:03:22 +05:30
|
|
|
static void freeHardLinkInfo(HardLinkInfo **hlInfoHeadPtr)
|
2000-12-07 06:04:58 +05:30
|
|
|
{
|
2006-11-24 20:21:01 +05:30
|
|
|
HardLinkInfo *hlInfo;
|
|
|
|
HardLinkInfo *hlInfoNext;
|
2000-12-07 06:04:58 +05:30
|
|
|
|
|
|
|
if (hlInfoHeadPtr) {
|
|
|
|
hlInfo = *hlInfoHeadPtr;
|
|
|
|
while (hlInfo) {
|
|
|
|
hlInfoNext = hlInfo->next;
|
|
|
|
free(hlInfo);
|
|
|
|
hlInfo = hlInfoNext;
|
|
|
|
}
|
|
|
|
*hlInfoHeadPtr = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-29 20:58:33 +05:30
|
|
|
/* Might be faster (and bigger) if the dev/ino were stored in numeric order ;) */
|
|
|
|
static HardLinkInfo *findHardLinkInfo(HardLinkInfo *hlInfo, struct stat *statbuf)
|
2000-12-07 06:04:58 +05:30
|
|
|
{
|
2002-08-22 19:14:08 +05:30
|
|
|
while (hlInfo) {
|
2009-11-29 20:58:33 +05:30
|
|
|
if (statbuf->st_ino == hlInfo->ino
|
|
|
|
&& statbuf->st_dev == hlInfo->dev
|
2009-11-29 12:15:33 +05:30
|
|
|
) {
|
|
|
|
DBG("found hardlink:'%s'", hlInfo->name);
|
2000-12-07 06:04:58 +05:30
|
|
|
break;
|
2009-11-29 12:15:33 +05:30
|
|
|
}
|
2000-12-07 06:04:58 +05:30
|
|
|
hlInfo = hlInfo->next;
|
|
|
|
}
|
2006-09-09 18:19:03 +05:30
|
|
|
return hlInfo;
|
2000-12-07 06:04:58 +05:30
|
|
|
}
|
|
|
|
|
2000-03-26 19:33:20 +05:30
|
|
|
/* Put an octal string into the specified buffer.
|
2019-08-01 18:37:21 +05:30
|
|
|
* The number is zero padded and possibly NUL terminated.
|
2006-11-26 05:17:32 +05:30
|
|
|
* Stores low-order bits only if whole value does not fit. */
|
|
|
|
static void putOctal(char *cp, int len, off_t value)
|
2000-03-26 19:33:20 +05:30
|
|
|
{
|
2009-11-29 12:15:33 +05:30
|
|
|
char tempBuffer[sizeof(off_t)*3 + 1];
|
2000-04-05 06:30:52 +05:30
|
|
|
char *tempString = tempBuffer;
|
2006-11-25 20:18:09 +05:30
|
|
|
int width;
|
2000-03-26 19:33:20 +05:30
|
|
|
|
2006-11-25 20:18:09 +05:30
|
|
|
width = sprintf(tempBuffer, "%0*"OFF_FMT"o", len, value);
|
|
|
|
tempString += (width - len);
|
2006-11-24 20:21:01 +05:30
|
|
|
|
2006-11-25 20:18:09 +05:30
|
|
|
/* If string has leading zeroes, we can drop one */
|
|
|
|
/* and field will have trailing '\0' */
|
|
|
|
/* (increases chances of compat with other tars) */
|
|
|
|
if (tempString[0] == '0')
|
|
|
|
tempString++;
|
2000-03-26 19:33:20 +05:30
|
|
|
|
2006-11-25 20:18:09 +05:30
|
|
|
/* Copy the string to the field */
|
2002-08-22 19:14:08 +05:30
|
|
|
memcpy(cp, tempString, len);
|
2000-03-26 19:33:20 +05:30
|
|
|
}
|
2006-11-26 05:26:50 +05:30
|
|
|
#define PUT_OCTAL(a, b) putOctal((a), sizeof(a), (b))
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2006-11-26 05:26:50 +05:30
|
|
|
static void writeLongname(int fd, int type, const char *name, int dir)
|
|
|
|
{
|
2019-08-01 18:37:21 +05:30
|
|
|
struct prefilled {
|
2006-11-26 05:26:50 +05:30
|
|
|
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 */
|
|
|
|
};
|
2010-06-26 21:51:36 +05:30
|
|
|
struct tar_header_t header;
|
2006-11-26 05:26:50 +05:30
|
|
|
int size;
|
|
|
|
|
2019-08-01 18:37:21 +05:30
|
|
|
memset(&header, 0, sizeof(header));
|
|
|
|
header.typeflag = type;
|
|
|
|
strcpy(header.name, "././@LongLink");
|
|
|
|
/* This sets mode/uid/gid/mtime to "00...00<NUL>" strings */
|
2020-10-01 06:37:22 +05:30
|
|
|
memset((char*)&header + offsetof(struct tar_header_t, mode), /* make gcc-9.x happy */
|
|
|
|
'0', sizeof(struct prefilled));
|
2019-08-01 18:37:21 +05:30
|
|
|
header.mode [sizeof(header.mode ) - 1] = '\0';
|
|
|
|
header.uid [sizeof(header.uid ) - 1] = '\0';
|
|
|
|
header.gid [sizeof(header.gid ) - 1] = '\0';
|
|
|
|
/* header.size is filled by '0' now, will be corrected below */
|
|
|
|
header.mtime[sizeof(header.mtime) - 1] = '\0';
|
|
|
|
|
2006-11-26 05:26:50 +05:30
|
|
|
dir = !!dir; /* normalize: 0/1 */
|
|
|
|
size = strlen(name) + 1 + dir; /* GNU tar uses strlen+1 */
|
|
|
|
/* + dir: account for possible '/' */
|
|
|
|
|
|
|
|
PUT_OCTAL(header.size, size);
|
2021-08-20 21:28:49 +05:30
|
|
|
chksum_and_xwrite_tar_header(fd, &header);
|
2006-11-26 05:26:50 +05:30
|
|
|
|
|
|
|
/* Write filename[/] and pad the block. */
|
|
|
|
/* dir=0: writes 'name<NUL>', pads */
|
|
|
|
/* dir=1: writes 'name', writes '/<NUL>', pads */
|
|
|
|
dir *= 2;
|
|
|
|
xwrite(fd, name, size - dir);
|
|
|
|
xwrite(fd, "/", dir);
|
|
|
|
size = (-size) & (TAR_BLOCK_SIZE-1);
|
2006-12-12 17:20:44 +05:30
|
|
|
memset(&header, 0, size);
|
2006-11-26 05:26:50 +05:30
|
|
|
xwrite(fd, &header, size);
|
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2000-03-26 19:33:20 +05:30
|
|
|
|
2000-04-05 00:09:50 +05:30
|
|
|
/* Write out a tar header for the specified file/directory/whatever */
|
2006-08-30 01:11:06 +05:30
|
|
|
static int writeTarHeader(struct TarBallInfo *tbInfo,
|
2006-09-09 18:19:03 +05:30
|
|
|
const char *header_name, const char *fileName, struct stat *statbuf)
|
2000-03-26 19:33:20 +05:30
|
|
|
{
|
2010-06-26 21:51:36 +05:30
|
|
|
struct tar_header_t header;
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2010-06-26 21:51:36 +05:30
|
|
|
memset(&header, 0, sizeof(header));
|
2010-07-06 22:16:02 +05:30
|
|
|
|
2006-11-26 05:26:50 +05:30
|
|
|
strncpy(header.name, header_name, sizeof(header.name));
|
2000-04-08 08:38:21 +05:30
|
|
|
|
2006-11-24 20:21:01 +05:30
|
|
|
/* POSIX says to mask mode with 07777. */
|
2006-11-25 20:18:09 +05:30
|
|
|
PUT_OCTAL(header.mode, statbuf->st_mode & 07777);
|
|
|
|
PUT_OCTAL(header.uid, statbuf->st_uid);
|
|
|
|
PUT_OCTAL(header.gid, statbuf->st_gid);
|
2006-11-24 20:29:45 +05:30
|
|
|
memset(header.size, '0', sizeof(header.size)-1); /* Regular file size is handled later */
|
2011-05-05 00:44:12 +05:30
|
|
|
/* users report that files with negative st_mtime cause trouble, so: */
|
|
|
|
PUT_OCTAL(header.mtime, statbuf->st_mtime >= 0 ? statbuf->st_mtime : 0);
|
2000-04-05 06:30:52 +05:30
|
|
|
|
2006-11-24 20:27:31 +05:30
|
|
|
/* Enter the user and group names */
|
|
|
|
safe_strncpy(header.uname, get_cached_username(statbuf->st_uid), sizeof(header.uname));
|
|
|
|
safe_strncpy(header.gname, get_cached_groupname(statbuf->st_gid), sizeof(header.gname));
|
2000-04-05 06:30:52 +05:30
|
|
|
|
2000-12-07 06:04:58 +05:30
|
|
|
if (tbInfo->hlInfo) {
|
|
|
|
/* This is a hard link */
|
|
|
|
header.typeflag = LNKTYPE;
|
2002-08-22 19:14:08 +05:30
|
|
|
strncpy(header.linkname, tbInfo->hlInfo->name,
|
|
|
|
sizeof(header.linkname));
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2006-11-26 05:26:50 +05:30
|
|
|
/* Write out long linkname if needed */
|
|
|
|
if (header.linkname[sizeof(header.linkname)-1])
|
|
|
|
writeLongname(tbInfo->tarFd, GNULONGLINK,
|
|
|
|
tbInfo->hlInfo->name, 0);
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2000-12-07 06:04:58 +05:30
|
|
|
} else if (S_ISLNK(statbuf->st_mode)) {
|
2007-02-11 21:49:28 +05:30
|
|
|
char *lpath = xmalloc_readlink_or_warn(fileName);
|
|
|
|
if (!lpath)
|
2006-09-09 18:19:03 +05:30
|
|
|
return FALSE;
|
2002-08-22 19:14:08 +05:30
|
|
|
header.typeflag = SYMTYPE;
|
|
|
|
strncpy(header.linkname, lpath, sizeof(header.linkname));
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2006-11-26 05:26:50 +05:30
|
|
|
/* Write out long linkname if needed */
|
|
|
|
if (header.linkname[sizeof(header.linkname)-1])
|
|
|
|
writeLongname(tbInfo->tarFd, GNULONGLINK, lpath, 0);
|
2017-11-13 06:10:28 +05:30
|
|
|
# else
|
2006-11-24 20:21:01 +05:30
|
|
|
/* If it is larger than 100 bytes, bail out */
|
2006-11-26 05:26:50 +05:30
|
|
|
if (header.linkname[sizeof(header.linkname)-1]) {
|
2006-11-24 20:21:01 +05:30
|
|
|
free(lpath);
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("names longer than "NAME_SIZE_STR" chars not supported");
|
2006-11-24 20:21:01 +05:30
|
|
|
return FALSE;
|
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2001-04-30 23:47:00 +05:30
|
|
|
free(lpath);
|
2000-04-05 00:09:50 +05:30
|
|
|
} else if (S_ISDIR(statbuf->st_mode)) {
|
2002-08-22 19:14:08 +05:30
|
|
|
header.typeflag = DIRTYPE;
|
2006-11-26 05:26:50 +05:30
|
|
|
/* Append '/' only if there is a space for it */
|
|
|
|
if (!header.name[sizeof(header.name)-1])
|
|
|
|
header.name[strlen(header.name)] = '/';
|
2000-04-05 00:09:50 +05:30
|
|
|
} else if (S_ISCHR(statbuf->st_mode)) {
|
2002-08-22 19:14:08 +05:30
|
|
|
header.typeflag = CHRTYPE;
|
2006-11-25 20:18:09 +05:30
|
|
|
PUT_OCTAL(header.devmajor, major(statbuf->st_rdev));
|
|
|
|
PUT_OCTAL(header.devminor, minor(statbuf->st_rdev));
|
2000-04-05 00:09:50 +05:30
|
|
|
} else if (S_ISBLK(statbuf->st_mode)) {
|
2002-08-22 19:14:08 +05:30
|
|
|
header.typeflag = BLKTYPE;
|
2006-11-25 20:18:09 +05:30
|
|
|
PUT_OCTAL(header.devmajor, major(statbuf->st_rdev));
|
|
|
|
PUT_OCTAL(header.devminor, minor(statbuf->st_rdev));
|
2000-04-05 00:09:50 +05:30
|
|
|
} else if (S_ISFIFO(statbuf->st_mode)) {
|
2002-08-22 19:14:08 +05:30
|
|
|
header.typeflag = FIFOTYPE;
|
2000-04-05 06:30:52 +05:30
|
|
|
} else if (S_ISREG(statbuf->st_mode)) {
|
2011-05-05 00:44:12 +05:30
|
|
|
/* header.size field is 12 bytes long */
|
|
|
|
/* Does octal-encoded size fit? */
|
|
|
|
uoff_t filesize = statbuf->st_size;
|
|
|
|
if (sizeof(filesize) <= 4
|
|
|
|
|| filesize <= (uoff_t)0777777777777LL
|
2006-11-25 20:18:09 +05:30
|
|
|
) {
|
2011-05-05 00:44:12 +05:30
|
|
|
PUT_OCTAL(header.size, filesize);
|
|
|
|
}
|
|
|
|
/* Does base256-encoded size fit?
|
|
|
|
* It always does unless off_t is wider than 64 bits.
|
|
|
|
*/
|
|
|
|
else if (ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */
|
2011-05-05 00:44:12 +05:30
|
|
|
&& (filesize <= 0x3fffffffffffffffffffffffLL)
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2011-05-05 00:44:12 +05:30
|
|
|
) {
|
2013-01-14 06:04:48 +05:30
|
|
|
/* GNU tar uses "base-256 encoding" for very large numbers.
|
|
|
|
* Encoding is binary, with highest bit always set as a marker
|
|
|
|
* and sign in next-highest bit:
|
|
|
|
* 80 00 .. 00 - zero
|
|
|
|
* bf ff .. ff - largest positive number
|
|
|
|
* ff ff .. ff - minus 1
|
|
|
|
* c0 00 .. 00 - smallest negative number
|
2011-05-05 00:44:12 +05:30
|
|
|
*/
|
|
|
|
char *p8 = header.size + sizeof(header.size);
|
|
|
|
do {
|
|
|
|
*--p8 = (uint8_t)filesize;
|
|
|
|
filesize >>= 8;
|
|
|
|
} while (p8 != header.size);
|
|
|
|
*p8 |= 0x80;
|
|
|
|
} else {
|
2009-11-13 13:38:27 +05:30
|
|
|
bb_error_msg_and_die("can't store file '%s' "
|
2009-12-11 17:06:10 +05:30
|
|
|
"of size %"OFF_FMT"u, aborting",
|
2006-11-25 20:18:09 +05:30
|
|
|
fileName, statbuf->st_size);
|
|
|
|
}
|
2006-11-26 05:17:32 +05:30
|
|
|
header.typeflag = REGTYPE;
|
2000-04-05 00:09:50 +05:30
|
|
|
} else {
|
2006-09-09 18:19:03 +05:30
|
|
|
bb_error_msg("%s: unknown file type", fileName);
|
|
|
|
return FALSE;
|
2000-03-28 06:28:14 +05:30
|
|
|
}
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2006-11-26 05:26:50 +05:30
|
|
|
/* Write out long name if needed */
|
|
|
|
/* (we, like GNU tar, output long linkname *before* long name) */
|
|
|
|
if (header.name[sizeof(header.name)-1])
|
|
|
|
writeLongname(tbInfo->tarFd, GNULONGNAME,
|
|
|
|
header_name, S_ISDIR(statbuf->st_mode));
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2021-08-20 21:28:49 +05:30
|
|
|
chksum_and_xwrite_tar_header(tbInfo->tarFd, &header);
|
2006-09-09 18:19:03 +05:30
|
|
|
|
2000-04-05 06:30:52 +05:30
|
|
|
/* Now do the verbose thing (or not) */
|
2002-07-24 03:35:47 +05:30
|
|
|
if (tbInfo->verboseFlag) {
|
2000-08-03 00:18:26 +05:30
|
|
|
FILE *vbFd = stdout;
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2008-12-12 07:44:35 +05:30
|
|
|
/* If archive goes to stdout, verbose goes to stderr */
|
|
|
|
if (tbInfo->tarFd == STDOUT_FILENO)
|
2000-08-03 00:18:26 +05:30
|
|
|
vbFd = stderr;
|
2006-11-25 03:25:55 +05:30
|
|
|
/* GNU "tar cvvf" prints "extended" listing a-la "ls -l" */
|
|
|
|
/* We don't have such excesses here: for us "v" == "vv" */
|
2006-11-26 05:26:50 +05:30
|
|
|
/* '/' is probably a GNUism */
|
|
|
|
fprintf(vbFd, "%s%s\n", header_name,
|
|
|
|
S_ISDIR(statbuf->st_mode) ? "/" : "");
|
2000-08-03 00:18:26 +05:30
|
|
|
}
|
2000-03-28 06:28:14 +05:30
|
|
|
|
2006-09-09 18:19:03 +05:30
|
|
|
return TRUE;
|
2000-03-28 06:28:14 +05:30
|
|
|
}
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_FROM
|
2006-08-30 01:11:06 +05:30
|
|
|
static int exclude_file(const llist_t *excluded_files, const char *file)
|
2001-10-05 08:28:48 +05:30
|
|
|
{
|
2002-09-25 08:17:48 +05:30
|
|
|
while (excluded_files) {
|
|
|
|
if (excluded_files->data[0] == '/') {
|
|
|
|
if (fnmatch(excluded_files->data, file,
|
2009-11-29 12:15:33 +05:30
|
|
|
FNM_PATHNAME | FNM_LEADING_DIR) == 0)
|
2001-10-05 08:28:48 +05:30
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
for (p = file; p[0] != '\0'; p++) {
|
2009-11-29 12:15:33 +05:30
|
|
|
if ((p == file || p[-1] == '/')
|
|
|
|
&& p[0] != '/'
|
|
|
|
&& fnmatch(excluded_files->data, p,
|
|
|
|
FNM_PATHNAME | FNM_LEADING_DIR) == 0
|
|
|
|
) {
|
2001-10-05 08:28:48 +05:30
|
|
|
return 1;
|
2009-11-29 12:15:33 +05:30
|
|
|
}
|
2001-10-05 08:28:48 +05:30
|
|
|
}
|
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
excluded_files = excluded_files->link;
|
2001-10-05 08:28:48 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# else
|
|
|
|
# define exclude_file(excluded_files, file) 0
|
|
|
|
# endif
|
2000-03-28 06:28:14 +05:30
|
|
|
|
2020-10-02 01:22:16 +05:30
|
|
|
static int FAST_FUNC writeFileToTarball(struct recursive_state *state,
|
|
|
|
const char *fileName,
|
|
|
|
struct stat *statbuf)
|
2000-03-28 06:28:14 +05:30
|
|
|
{
|
2020-10-02 01:22:16 +05:30
|
|
|
struct TarBallInfo *tbInfo = (struct TarBallInfo *) state->userData;
|
2000-12-20 02:15:49 +05:30
|
|
|
const char *header_name;
|
2006-01-09 08:37:44 +05:30
|
|
|
int inputFileFd = -1;
|
2000-04-05 00:09:50 +05:30
|
|
|
|
2009-11-29 12:15:33 +05:30
|
|
|
DBG("writeFileToTarball('%s')", fileName);
|
|
|
|
|
2011-03-02 05:51:02 +05:30
|
|
|
/* Strip leading '/' and such (must be before memorizing hardlink's name) */
|
|
|
|
header_name = strip_unsafe_prefix(fileName);
|
2007-09-25 00:37:57 +05:30
|
|
|
|
|
|
|
if (header_name[0] == '\0')
|
|
|
|
return TRUE;
|
|
|
|
|
2021-06-27 19:41:57 +05:30
|
|
|
if (exclude_file(tbInfo->excludeList, header_name))
|
|
|
|
return SKIP; /* "do not recurse on this directory", no error message printed */
|
|
|
|
|
2007-09-25 01:02:53 +05:30
|
|
|
/* It is against the rules to archive a socket */
|
|
|
|
if (S_ISSOCK(statbuf->st_mode)) {
|
|
|
|
bb_error_msg("%s: socket ignored", fileName);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2000-12-07 06:04:58 +05:30
|
|
|
/*
|
2006-09-09 18:19:03 +05:30
|
|
|
* Check to see if we are dealing with a hard link.
|
|
|
|
* If so -
|
2017-04-17 19:43:32 +05:30
|
|
|
* Treat the first occurrence of a given dev/inode as a file while
|
|
|
|
* treating any additional occurrences as hard links. This is done
|
2006-09-09 18:19:03 +05:30
|
|
|
* by adding the file information to the HardLinkInfo linked list.
|
2002-08-22 19:14:08 +05:30
|
|
|
*/
|
2000-12-07 06:04:58 +05:30
|
|
|
tbInfo->hlInfo = NULL;
|
2009-11-29 12:15:33 +05:30
|
|
|
if (!S_ISDIR(statbuf->st_mode) && statbuf->st_nlink > 1) {
|
|
|
|
DBG("'%s': st_nlink > 1", header_name);
|
2009-11-29 20:58:33 +05:30
|
|
|
tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf);
|
2009-11-29 12:15:33 +05:30
|
|
|
if (tbInfo->hlInfo == NULL) {
|
|
|
|
DBG("'%s': addHardLinkInfo", header_name);
|
2007-09-25 00:37:57 +05:30
|
|
|
addHardLinkInfo(&tbInfo->hlInfoHead, statbuf, header_name);
|
2009-11-29 12:15:33 +05:30
|
|
|
}
|
2000-12-07 06:04:58 +05:30
|
|
|
}
|
|
|
|
|
2000-04-05 00:09:50 +05:30
|
|
|
/* 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 */
|
2009-11-29 12:15:33 +05:30
|
|
|
if (tbInfo->tarFileStatBuf.st_dev == statbuf->st_dev
|
|
|
|
&& tbInfo->tarFileStatBuf.st_ino == statbuf->st_ino
|
2007-09-25 00:37:57 +05:30
|
|
|
) {
|
2003-03-19 14:43:01 +05:30
|
|
|
bb_error_msg("%s: file is the archive; skipping", fileName);
|
2006-09-09 18:19:03 +05:30
|
|
|
return TRUE;
|
2000-04-05 00:09:50 +05:30
|
|
|
}
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS
|
2007-09-25 00:37:57 +05:30
|
|
|
if (strlen(header_name) >= NAME_SIZE) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("names longer than "NAME_SIZE_STR" chars not supported");
|
2006-09-09 18:19:03 +05:30
|
|
|
return TRUE;
|
2000-09-24 06:24:37 +05:30
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2000-09-24 06:24:37 +05:30
|
|
|
|
2006-01-09 08:37:44 +05:30
|
|
|
/* Is this a regular file? */
|
2006-11-24 20:21:01 +05:30
|
|
|
if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) {
|
2000-04-05 06:30:52 +05:30
|
|
|
/* open the file we want to archive, and make sure all is well */
|
2007-04-12 04:50:53 +05:30
|
|
|
inputFileFd = open_or_warn(fileName, O_RDONLY);
|
2006-11-24 20:21:01 +05:30
|
|
|
if (inputFileFd < 0) {
|
2021-06-27 19:41:57 +05:30
|
|
|
return FALSE; /* make recursive_action() return FALSE */
|
2000-04-05 06:30:52 +05:30
|
|
|
}
|
2006-01-09 08:37:44 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* Add an entry to the tarball */
|
|
|
|
if (writeTarHeader(tbInfo, header_name, fileName, statbuf) == FALSE) {
|
2021-06-27 19:41:57 +05:30
|
|
|
return FALSE; /* make recursive_action() return FALSE */
|
2006-01-09 08:37:44 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* If it was a regular file, write out the body */
|
2006-09-09 18:19:03 +05:30
|
|
|
if (inputFileFd >= 0) {
|
2006-12-22 05:51:07 +05:30
|
|
|
size_t readSize;
|
2007-04-12 04:50:53 +05:30
|
|
|
/* Write the file to the archive. */
|
2006-12-22 05:51:07 +05:30
|
|
|
/* We record size into header first, */
|
|
|
|
/* and then write out file. If file shrinks in between, */
|
|
|
|
/* tar will be corrupted. So we don't allow for that. */
|
|
|
|
/* NB: GNU tar 1.16 warns and pads with zeroes */
|
|
|
|
/* or even seeks back and updates header */
|
|
|
|
bb_copyfd_exact_size(inputFileFd, tbInfo->tarFd, statbuf->st_size);
|
|
|
|
////off_t readSize;
|
|
|
|
////readSize = bb_copyfd_size(inputFileFd, tbInfo->tarFd, statbuf->st_size);
|
|
|
|
////if (readSize != statbuf->st_size && readSize >= 0) {
|
|
|
|
//// bb_error_msg_and_die("short read from %s, aborting", fileName);
|
|
|
|
////}
|
|
|
|
|
2006-11-24 20:25:23 +05:30
|
|
|
/* Check that file did not grow in between? */
|
2006-12-22 05:51:07 +05:30
|
|
|
/* if (safe_read(inputFileFd, 1) == 1) warn but continue? */
|
|
|
|
|
2006-01-09 08:37:44 +05:30
|
|
|
close(inputFileFd);
|
2003-11-22 03:54:57 +05:30
|
|
|
|
2000-04-05 06:30:52 +05:30
|
|
|
/* Pad the file up to the tar block size */
|
2006-11-24 20:21:01 +05:30
|
|
|
/* (a few tricks here in the name of code size) */
|
2006-12-22 05:51:07 +05:30
|
|
|
readSize = (-(int)statbuf->st_size) & (TAR_BLOCK_SIZE-1);
|
2007-06-04 15:46:52 +05:30
|
|
|
memset(block_buf, 0, readSize);
|
|
|
|
xwrite(tbInfo->tarFd, block_buf, readSize);
|
2000-04-05 06:30:52 +05:30
|
|
|
}
|
2000-04-05 00:09:50 +05:30
|
|
|
|
2006-09-09 18:19:03 +05:30
|
|
|
return TRUE;
|
2000-03-26 19:33:20 +05:30
|
|
|
}
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if SEAMLESS_COMPRESSION
|
2008-04-22 03:26:07 +05:30
|
|
|
/* Don't inline: vfork scares gcc and pessimizes code */
|
2014-12-11 20:03:07 +05:30
|
|
|
static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
|
2008-04-22 03:26:07 +05:30
|
|
|
{
|
2008-02-19 16:56:28 +05:30
|
|
|
// On Linux, vfork never unpauses parent early, although standard
|
|
|
|
// allows for that. Do we want to waste bytes checking for it?
|
2017-11-13 06:10:28 +05:30
|
|
|
# define WAIT_FOR_CHILD 0
|
2008-04-22 03:26:07 +05:30
|
|
|
volatile int vfork_exec_errno = 0;
|
2018-08-04 21:18:59 +05:30
|
|
|
struct fd_pair data;
|
2017-11-13 06:10:28 +05:30
|
|
|
# if WAIT_FOR_CHILD
|
2018-08-04 21:18:59 +05:30
|
|
|
struct fd_pair status;
|
|
|
|
xpiped_pair(status);
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2018-08-04 21:18:59 +05:30
|
|
|
xpiped_pair(data);
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2008-04-22 03:26:07 +05:30
|
|
|
signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2018-08-04 21:18:59 +05:30
|
|
|
if (xvfork() == 0) {
|
2008-04-22 03:26:07 +05:30
|
|
|
/* child */
|
2018-08-04 21:45:19 +05:30
|
|
|
int tfd;
|
2008-04-22 03:26:07 +05:30
|
|
|
/* NB: close _first_, then move fds! */
|
2018-08-04 21:18:59 +05:30
|
|
|
close(data.wr);
|
2017-11-13 06:10:28 +05:30
|
|
|
# if WAIT_FOR_CHILD
|
2018-08-04 21:18:59 +05:30
|
|
|
close(status.rd);
|
|
|
|
/* status.wr will close only on exec -
|
2008-04-22 03:26:07 +05:30
|
|
|
* parent waits for this close to happen */
|
2018-08-04 21:18:59 +05:30
|
|
|
fcntl(status.wr, F_SETFD, FD_CLOEXEC);
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2018-08-04 21:45:19 +05:30
|
|
|
/* copy it: parent's tar_fd variable must not change */
|
|
|
|
tfd = tar_fd;
|
|
|
|
if (tfd == 0) {
|
|
|
|
/* Output tar fd may be zero.
|
|
|
|
* xmove_fd(data.rd, 0) would destroy it.
|
|
|
|
* Reproducer:
|
|
|
|
* exec 0>&-
|
|
|
|
* exec 1>&-
|
|
|
|
* tar czf Z.tar.gz FILE
|
|
|
|
* Swapping move_fd's order wouldn't work:
|
|
|
|
* data.rd is 1 and _it_ would be destroyed.
|
|
|
|
*/
|
2018-08-05 00:36:02 +05:30
|
|
|
tfd = dup(tfd);
|
2018-08-04 21:45:19 +05:30
|
|
|
}
|
2018-08-04 21:18:59 +05:30
|
|
|
xmove_fd(data.rd, 0);
|
2018-08-04 21:45:19 +05:30
|
|
|
xmove_fd(tfd, 1);
|
2019-08-02 18:49:56 +05:30
|
|
|
|
|
|
|
/* exec gzip/bzip2/... program */
|
|
|
|
//BB_EXECLP(gzip, gzip, "-f", (char *)0); - WRONG for "xz",
|
|
|
|
// if xz is an enabled applet, it'll be a version which
|
|
|
|
// can only decompress. We do need to execute external
|
|
|
|
// program, not applet.
|
|
|
|
execlp(gzip, gzip, "-f", (char *)0);
|
|
|
|
|
2008-04-22 03:26:07 +05:30
|
|
|
vfork_exec_errno = errno;
|
2008-05-19 14:59:47 +05:30
|
|
|
_exit(EXIT_FAILURE);
|
2008-04-22 03:26:07 +05:30
|
|
|
}
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2008-04-22 03:26:07 +05:30
|
|
|
/* parent */
|
2018-08-04 21:18:59 +05:30
|
|
|
xmove_fd(data.wr, tar_fd);
|
|
|
|
close(data.rd);
|
2017-11-13 06:10:28 +05:30
|
|
|
# if WAIT_FOR_CHILD
|
2018-08-04 21:18:59 +05:30
|
|
|
close(status.wr);
|
2008-04-22 03:26:07 +05:30
|
|
|
while (1) {
|
|
|
|
/* Wait until child execs (or fails to) */
|
2018-08-04 21:18:59 +05:30
|
|
|
char buf;
|
|
|
|
int n = full_read(status.rd, &buf, 1);
|
2008-04-22 03:26:07 +05:30
|
|
|
if (n < 0 /* && errno == EAGAIN */)
|
|
|
|
continue; /* try it again */
|
|
|
|
}
|
2018-08-04 21:18:59 +05:30
|
|
|
close(status.rd);
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2008-04-22 03:26:07 +05:30
|
|
|
if (vfork_exec_errno) {
|
|
|
|
errno = vfork_exec_errno;
|
2014-12-11 20:03:07 +05:30
|
|
|
bb_perror_msg_and_die("can't execute '%s'", gzip);
|
2002-07-24 03:35:47 +05:30
|
|
|
}
|
2008-04-22 03:26:07 +05:30
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif /* SEAMLESS_COMPRESSION */
|
2008-04-22 03:26:07 +05:30
|
|
|
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if !SEAMLESS_COMPRESSION
|
2014-12-11 20:03:07 +05:30
|
|
|
/* Do not pass gzip flag to writeTarFile() */
|
2017-11-13 06:10:28 +05:30
|
|
|
#define writeTarFile(tbInfo, recurseFlags, filelist, gzip) \
|
|
|
|
writeTarFile(tbInfo, recurseFlags, filelist)
|
|
|
|
# endif
|
2008-04-22 03:26:07 +05:30
|
|
|
/* gcc 4.2.1 inlines it, making code bigger */
|
2017-11-13 06:10:28 +05:30
|
|
|
static NOINLINE int writeTarFile(
|
|
|
|
struct TarBallInfo *tbInfo,
|
|
|
|
int recurseFlags,
|
|
|
|
const llist_t *filelist,
|
|
|
|
const char *gzip)
|
2008-04-22 03:26:07 +05:30
|
|
|
{
|
|
|
|
int errorFlag = FALSE;
|
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
/*tbInfo->hlInfoHead = NULL; - already is */
|
2008-04-22 03:26:07 +05:30
|
|
|
|
|
|
|
/* Store the stat info for the tarball's file, so
|
|
|
|
* can avoid including the tarball into itself.... */
|
2017-11-13 06:10:28 +05:30
|
|
|
xfstat(tbInfo->tarFd, &tbInfo->tarFileStatBuf, "can't stat tar file");
|
2008-04-22 03:26:07 +05:30
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if SEAMLESS_COMPRESSION
|
2008-04-22 03:26:07 +05:30
|
|
|
if (gzip)
|
2017-11-13 06:10:28 +05:30
|
|
|
vfork_compressor(tbInfo->tarFd, gzip);
|
|
|
|
# endif
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2000-03-26 19:33:20 +05:30
|
|
|
/* Read the directory/files and iterate over them one at a time */
|
2017-11-13 06:10:28 +05:30
|
|
|
while (filelist) {
|
|
|
|
if (!recursive_action(filelist->data, recurseFlags,
|
2020-10-02 01:22:16 +05:30
|
|
|
writeFileToTarball, writeFileToTarball, tbInfo)
|
2009-11-29 20:58:33 +05:30
|
|
|
) {
|
2000-04-05 00:09:50 +05:30
|
|
|
errorFlag = TRUE;
|
2000-03-28 06:28:14 +05:30
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
filelist = filelist->link;
|
2000-03-26 19:33:20 +05:30
|
|
|
}
|
2000-04-05 06:30:52 +05:30
|
|
|
/* Write two empty blocks to the end of the archive */
|
2007-06-04 15:46:52 +05:30
|
|
|
memset(block_buf, 0, 2*TAR_BLOCK_SIZE);
|
2017-11-13 06:10:28 +05:30
|
|
|
xwrite(tbInfo->tarFd, block_buf, 2*TAR_BLOCK_SIZE);
|
2000-04-09 20:47:40 +05:30
|
|
|
|
|
|
|
/* To be pedantically correct, we would check if the tarball
|
2000-11-15 03:45:48 +05:30
|
|
|
* is smaller than 20 tar blocks, and pad it if it was smaller,
|
2000-04-09 20:47:40 +05:30
|
|
|
* but that isn't necessary for GNU tar interoperability, and
|
|
|
|
* so is considered a waste of space */
|
|
|
|
|
2005-12-17 03:03:10 +05:30
|
|
|
/* Close so the child process (if any) will exit */
|
2017-11-13 06:10:28 +05:30
|
|
|
close(tbInfo->tarFd);
|
2005-12-17 03:03:10 +05:30
|
|
|
|
2000-04-05 00:09:50 +05:30
|
|
|
/* Hang up the tools, close up shop, head home */
|
2005-12-17 03:03:10 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
2017-11-13 06:10:28 +05:30
|
|
|
freeHardLinkInfo(&tbInfo->hlInfoHead);
|
2005-10-16 09:24:49 +05:30
|
|
|
|
2002-08-22 19:14:08 +05:30
|
|
|
if (errorFlag)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("error exit delayed from previous errors");
|
2002-08-22 19:14:08 +05:30
|
|
|
|
2017-11-13 06:10:28 +05:30
|
|
|
# if SEAMLESS_COMPRESSION
|
2008-04-22 03:26:07 +05:30
|
|
|
if (gzip) {
|
2006-12-18 00:38:20 +05:30
|
|
|
int status;
|
2008-04-22 03:26:07 +05:30
|
|
|
if (safe_waitpid(-1, &status, 0) == -1)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("waitpid");
|
2006-12-18 00:38:20 +05:30
|
|
|
else if (!WIFEXITED(status) || WEXITSTATUS(status))
|
|
|
|
/* gzip was killed or has exited with nonzero! */
|
|
|
|
errorFlag = TRUE;
|
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
2006-12-18 00:38:20 +05:30
|
|
|
return errorFlag;
|
2000-03-26 19:33:20 +05:30
|
|
|
}
|
2017-11-13 06:10:28 +05:30
|
|
|
|
2018-08-04 21:45:19 +05:30
|
|
|
#endif /* FEATURE_TAR_CREATE */
|
2000-03-26 19:33:20 +05:30
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_FROM
|
2003-06-26 14:37:59 +05:30
|
|
|
static llist_t *append_file_list_to_list(llist_t *list)
|
2001-10-05 08:28:48 +05:30
|
|
|
{
|
2003-06-26 14:37:59 +05:30
|
|
|
llist_t *newlist = NULL;
|
|
|
|
|
2008-06-15 11:10:56 +05:30
|
|
|
while (list) {
|
2017-11-13 06:10:28 +05:30
|
|
|
FILE *src_stream;
|
|
|
|
char *line;
|
|
|
|
|
2011-02-03 08:30:23 +05:30
|
|
|
src_stream = xfopen_stdin(llist_pop(&list));
|
2008-03-27 01:34:27 +05:30
|
|
|
while ((line = xmalloc_fgetline(src_stream)) != NULL) {
|
2006-11-25 03:25:55 +05:30
|
|
|
/* kill trailing '/' unless the string is just "/" */
|
|
|
|
char *cp = last_char_is(line, '/');
|
|
|
|
if (cp > line)
|
|
|
|
*cp = '\0';
|
2013-08-15 15:49:29 +05:30
|
|
|
llist_add_to_end(&newlist, line);
|
2006-09-03 19:34:33 +05:30
|
|
|
}
|
2005-10-16 09:24:49 +05:30
|
|
|
fclose(src_stream);
|
2003-06-26 14:37:59 +05:30
|
|
|
}
|
|
|
|
return newlist;
|
2001-10-05 08:28:48 +05:30
|
|
|
}
|
2002-09-25 08:17:48 +05:30
|
|
|
#endif
|
2000-03-26 19:33:20 +05:30
|
|
|
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage:#define tar_trivial_usage
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: IF_FEATURE_TAR_CREATE("c|") "x|t [-"
|
2011-01-31 10:05:23 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_Z("Z")
|
|
|
|
//usage: IF_FEATURE_SEAMLESS_GZ("z")
|
2012-05-24 12:31:55 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_XZ("J")
|
2011-01-31 10:05:23 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_BZ2("j")
|
2019-08-02 18:49:56 +05:30
|
|
|
//usage: "a"
|
2011-01-31 10:05:23 +05:30
|
|
|
//usage: IF_FEATURE_TAR_CREATE("h")
|
|
|
|
//usage: IF_FEATURE_TAR_NOPRESERVE_TIME("m")
|
2018-03-16 08:32:23 +05:30
|
|
|
//usage: "vokO] "
|
2017-11-11 02:44:22 +05:30
|
|
|
//usage: "[-f TARFILE] [-C DIR] "
|
2021-06-13 06:42:09 +05:30
|
|
|
//usage: IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[LONGOPT]... "))
|
2017-11-11 02:44:22 +05:30
|
|
|
//usage: "[FILE]..."
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage:#define tar_full_usage "\n\n"
|
|
|
|
//usage: IF_FEATURE_TAR_CREATE("Create, extract, ")
|
|
|
|
//usage: IF_NOT_FEATURE_TAR_CREATE("Extract ")
|
2018-04-08 00:34:39 +05:30
|
|
|
//usage: "or list files from a tar file"
|
|
|
|
//usage: "\n"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: IF_FEATURE_TAR_CREATE(
|
|
|
|
//usage: "\n c Create"
|
|
|
|
//usage: )
|
|
|
|
//usage: "\n x Extract"
|
|
|
|
//usage: "\n t List"
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -f FILE Name of TARFILE ('-' for stdin/out)"
|
|
|
|
//usage: "\n -C DIR Change to DIR before operation"
|
|
|
|
//usage: "\n -v Verbose"
|
2018-03-16 08:32:23 +05:30
|
|
|
//usage: "\n -O Extract to stdout"
|
|
|
|
//usage: IF_FEATURE_TAR_NOPRESERVE_TIME(
|
|
|
|
//usage: "\n -m Don't restore mtime"
|
|
|
|
//usage: )
|
2018-03-16 08:25:14 +05:30
|
|
|
//usage: "\n -o Don't restore user:group"
|
|
|
|
///////:-p - accepted but ignored, restores mode (aliases in GNU tar: --preserve-permissions, --same-permissions)
|
|
|
|
//usage: "\n -k Don't replace existing files"
|
2011-01-31 10:05:23 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_Z(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -Z (De)compress using compress"
|
2011-01-31 10:05:23 +05:30
|
|
|
//usage: )
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_GZ(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -z (De)compress using gzip"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: )
|
2012-05-24 12:31:55 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_XZ(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -J (De)compress using xz"
|
2012-05-24 12:31:55 +05:30
|
|
|
//usage: )
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_BZ2(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -j (De)compress using bzip2"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: )
|
2020-12-08 21:16:41 +05:30
|
|
|
//usage: IF_FEATURE_SEAMLESS_LZMA(
|
|
|
|
//usage: IF_FEATURE_TAR_LONG_OPTIONS(
|
|
|
|
//usage: "\n --lzma (De)compress using lzma"
|
|
|
|
//usage: )
|
|
|
|
//usage: )
|
2019-08-02 18:49:56 +05:30
|
|
|
//usage: "\n -a (De)compress based on extension"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: IF_FEATURE_TAR_CREATE(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -h Follow symlinks"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: )
|
|
|
|
//usage: IF_FEATURE_TAR_FROM(
|
2017-11-13 06:26:51 +05:30
|
|
|
//usage: "\n -T FILE File with names to include"
|
|
|
|
//usage: "\n -X FILE File with glob patterns to exclude"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: IF_FEATURE_TAR_LONG_OPTIONS(
|
2017-11-11 02:44:22 +05:30
|
|
|
//usage: "\n --exclude PATTERN Glob pattern to exclude"
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage: )
|
|
|
|
//usage: )
|
2020-12-08 21:16:41 +05:30
|
|
|
//usage: IF_FEATURE_TAR_LONG_OPTIONS(
|
|
|
|
//usage: "\n --overwrite Replace existing files"
|
|
|
|
//usage: "\n --strip-components NUM NUM of leading components to strip"
|
|
|
|
//usage: "\n --no-recursion Don't descend in directories"
|
|
|
|
//usage: "\n --numeric-owner Use numeric user:group"
|
|
|
|
//usage: "\n --no-same-permissions Don't restore access permissions"
|
|
|
|
//usage: IF_FEATURE_TAR_TO_COMMAND(
|
|
|
|
//usage: "\n --to-command COMMAND Pipe files to COMMAND"
|
|
|
|
//usage: )
|
|
|
|
//usage: )
|
2010-06-26 21:51:36 +05:30
|
|
|
//usage:
|
|
|
|
//usage:#define tar_example_usage
|
|
|
|
//usage: "$ zcat /tmp/tarball.tar.gz | tar -xf -\n"
|
|
|
|
//usage: "$ tar -cf /tmp/tarball.tar /usr/local\n"
|
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
enum {
|
2009-10-25 05:43:32 +05:30
|
|
|
OPTBIT_KEEP_OLD = 8,
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_TAR_CREATE( OPTBIT_CREATE ,)
|
|
|
|
IF_FEATURE_TAR_CREATE( OPTBIT_DEREFERENCE ,)
|
|
|
|
IF_FEATURE_SEAMLESS_BZ2( OPTBIT_BZIP2 ,)
|
|
|
|
IF_FEATURE_TAR_FROM( OPTBIT_INCLUDE_FROM,)
|
|
|
|
IF_FEATURE_TAR_FROM( OPTBIT_EXCLUDE_FROM,)
|
|
|
|
IF_FEATURE_SEAMLESS_GZ( OPTBIT_GZIP ,)
|
2019-08-02 18:49:56 +05:30
|
|
|
IF_FEATURE_SEAMLESS_XZ( OPTBIT_XZ ,)
|
|
|
|
IF_FEATURE_SEAMLESS_Z( OPTBIT_COMPRESS ,) // 16th bit
|
|
|
|
OPTBIT_AUTOCOMPRESS_BY_EXT,
|
2010-01-19 19:52:30 +05:30
|
|
|
IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
|
2009-12-17 03:16:01 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS
|
2015-10-22 04:37:13 +05:30
|
|
|
OPTBIT_STRIP_COMPONENTS,
|
2019-08-02 18:49:56 +05:30
|
|
|
IF_FEATURE_SEAMLESS_LZMA(OPTBIT_LZMA ,)
|
2012-04-24 20:36:19 +05:30
|
|
|
OPTBIT_NORECURSION,
|
2010-06-25 05:03:00 +05:30
|
|
|
IF_FEATURE_TAR_TO_COMMAND(OPTBIT_2COMMAND ,)
|
2009-04-21 06:22:21 +05:30
|
|
|
OPTBIT_NUMERIC_OWNER,
|
2009-09-17 06:13:14 +05:30
|
|
|
OPTBIT_NOPRESERVE_PERM,
|
2009-12-17 03:48:59 +05:30
|
|
|
OPTBIT_OVERWRITE,
|
2009-12-17 03:16:01 +05:30
|
|
|
#endif
|
2006-11-25 03:24:44 +05:30
|
|
|
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
|
2009-12-17 03:16:01 +05:30
|
|
|
OPT_NOPRESERVE_OWNER = 1 << 5, // o == no-same-owner
|
2009-10-25 05:43:32 +05:30
|
|
|
OPT_P = 1 << 6, // p
|
|
|
|
OPT_VERBOSE = 1 << 7, // v
|
|
|
|
OPT_KEEP_OLD = 1 << 8, // k
|
2009-04-21 16:39:40 +05:30
|
|
|
OPT_CREATE = IF_FEATURE_TAR_CREATE( (1 << OPTBIT_CREATE )) + 0, // c
|
|
|
|
OPT_DEREFERENCE = IF_FEATURE_TAR_CREATE( (1 << OPTBIT_DEREFERENCE )) + 0, // h
|
|
|
|
OPT_BZIP2 = IF_FEATURE_SEAMLESS_BZ2( (1 << OPTBIT_BZIP2 )) + 0, // j
|
|
|
|
OPT_INCLUDE_FROM = IF_FEATURE_TAR_FROM( (1 << OPTBIT_INCLUDE_FROM)) + 0, // T
|
|
|
|
OPT_EXCLUDE_FROM = IF_FEATURE_TAR_FROM( (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X
|
|
|
|
OPT_GZIP = IF_FEATURE_SEAMLESS_GZ( (1 << OPTBIT_GZIP )) + 0, // z
|
2012-05-24 12:31:55 +05:30
|
|
|
OPT_XZ = IF_FEATURE_SEAMLESS_XZ( (1 << OPTBIT_XZ )) + 0, // J
|
2009-04-21 16:39:40 +05:30
|
|
|
OPT_COMPRESS = IF_FEATURE_SEAMLESS_Z( (1 << OPTBIT_COMPRESS )) + 0, // Z
|
2019-08-02 18:49:56 +05:30
|
|
|
OPT_AUTOCOMPRESS_BY_EXT = 1 << OPTBIT_AUTOCOMPRESS_BY_EXT, // a
|
2015-10-22 04:37:13 +05:30
|
|
|
OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
|
|
|
|
OPT_STRIP_COMPONENTS = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_STRIP_COMPONENTS)) + 0, // strip-components
|
2019-08-02 18:49:56 +05:30
|
|
|
OPT_LZMA = IF_FEATURE_TAR_LONG_OPTIONS(IF_FEATURE_SEAMLESS_LZMA((1 << OPTBIT_LZMA))) + 0, // lzma
|
2015-10-22 04:37:13 +05:30
|
|
|
OPT_NORECURSION = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION )) + 0, // no-recursion
|
|
|
|
OPT_2COMMAND = IF_FEATURE_TAR_TO_COMMAND( (1 << OPTBIT_2COMMAND )) + 0, // to-command
|
|
|
|
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
|
2012-03-06 20:57:48 +05:30
|
|
|
|
2012-05-24 12:31:55 +05:30
|
|
|
OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_XZ | OPT_COMPRESS),
|
2006-11-25 03:24:44 +05:30
|
|
|
};
|
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS
|
2007-08-13 02:28:27 +05:30
|
|
|
static const char tar_longopts[] ALIGN1 =
|
2007-07-23 22:44:14 +05:30
|
|
|
"list\0" No_argument "t"
|
|
|
|
"extract\0" No_argument "x"
|
|
|
|
"directory\0" Required_argument "C"
|
|
|
|
"file\0" Required_argument "f"
|
|
|
|
"to-stdout\0" No_argument "O"
|
2009-10-25 05:43:32 +05:30
|
|
|
/* 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"
|
2007-07-23 22:44:14 +05:30
|
|
|
"same-permissions\0" No_argument "p"
|
|
|
|
"verbose\0" No_argument "v"
|
|
|
|
"keep-old\0" No_argument "k"
|
2006-11-25 03:24:44 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_CREATE
|
2007-07-23 22:44:14 +05:30
|
|
|
"create\0" No_argument "c"
|
|
|
|
"dereference\0" No_argument "h"
|
2003-12-26 19:31:37 +05:30
|
|
|
# endif
|
2008-08-05 18:40:34 +05:30
|
|
|
# if ENABLE_FEATURE_SEAMLESS_BZ2
|
2007-07-23 22:44:14 +05:30
|
|
|
"bzip2\0" No_argument "j"
|
2003-12-26 19:31:37 +05:30
|
|
|
# endif
|
2006-11-25 03:24:44 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_FROM
|
2007-07-23 22:44:14 +05:30
|
|
|
"files-from\0" Required_argument "T"
|
|
|
|
"exclude-from\0" Required_argument "X"
|
2003-12-26 19:31:37 +05:30
|
|
|
# endif
|
2008-08-05 18:40:34 +05:30
|
|
|
# if ENABLE_FEATURE_SEAMLESS_GZ
|
2007-07-23 22:44:14 +05:30
|
|
|
"gzip\0" No_argument "z"
|
2003-12-26 19:31:37 +05:30
|
|
|
# endif
|
2012-05-24 12:31:55 +05:30
|
|
|
# if ENABLE_FEATURE_SEAMLESS_XZ
|
|
|
|
"xz\0" No_argument "J"
|
|
|
|
# endif
|
2008-08-05 18:40:34 +05:30
|
|
|
# if ENABLE_FEATURE_SEAMLESS_Z
|
2007-07-23 22:44:14 +05:30
|
|
|
"compress\0" No_argument "Z"
|
2010-01-19 19:52:30 +05:30
|
|
|
# endif
|
2019-08-02 18:49:56 +05:30
|
|
|
"auto-compress\0" No_argument "a"
|
2010-01-19 19:52:30 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
|
|
|
|
"touch\0" No_argument "m"
|
2010-06-25 05:03:00 +05:30
|
|
|
# endif
|
2019-08-02 18:49:56 +05:30
|
|
|
"strip-components\0" Required_argument "\xf8"
|
|
|
|
# if ENABLE_FEATURE_SEAMLESS_LZMA
|
|
|
|
"lzma\0" No_argument "\xf9"
|
|
|
|
# endif
|
2012-04-24 20:36:19 +05:30
|
|
|
"no-recursion\0" No_argument "\xfa"
|
2010-06-25 05:03:00 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_TO_COMMAND
|
|
|
|
"to-command\0" Required_argument "\xfb"
|
2003-12-26 19:31:37 +05:30
|
|
|
# endif
|
2009-09-17 06:13:14 +05:30
|
|
|
/* use numeric uid/gid from tar header, not textual */
|
2009-12-17 03:48:59 +05:30
|
|
|
"numeric-owner\0" No_argument "\xfc"
|
2009-09-17 06:13:14 +05:30
|
|
|
/* do not restore mode */
|
2009-12-17 03:48:59 +05:30
|
|
|
"no-same-permissions\0" No_argument "\xfd"
|
|
|
|
/* on unpack, open with O_TRUNC and !O_EXCL */
|
|
|
|
"overwrite\0" No_argument "\xfe"
|
2006-11-28 01:54:40 +05:30
|
|
|
/* --exclude takes next bit position in option mask, */
|
2009-12-17 03:16:01 +05:30
|
|
|
/* therefore we have to put it _after_ --no-same-permissions */
|
2006-11-28 01:54:40 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_FROM
|
2007-07-23 22:44:14 +05:30
|
|
|
"exclude\0" Required_argument "\xff"
|
2006-11-28 01:54:40 +05:30
|
|
|
# endif
|
2007-07-24 21:24:42 +05:30
|
|
|
;
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
# define GETOPT32 getopt32long
|
|
|
|
# define LONGOPTS ,tar_longopts
|
|
|
|
#else
|
|
|
|
# define GETOPT32 getopt32
|
|
|
|
# define LONGOPTS
|
2003-12-26 19:31:37 +05:30
|
|
|
#endif
|
2002-11-27 13:22:22 +05:30
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int tar_main(int argc UNUSED_PARAM, char **argv)
|
2001-10-05 08:28:48 +05:30
|
|
|
{
|
2002-09-25 08:17:48 +05:30
|
|
|
archive_handle_t *tar_handle;
|
|
|
|
char *base_dir = NULL;
|
2002-11-26 05:27:27 +05:30
|
|
|
const char *tar_filename = "-";
|
2006-10-04 02:30:06 +05:30
|
|
|
unsigned opt;
|
2006-11-25 03:25:55 +05:30
|
|
|
int verboseFlag = 0;
|
2007-02-05 03:00:35 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
|
2005-10-15 12:02:38 +05:30
|
|
|
llist_t *excludes = NULL;
|
2007-02-05 03:00:35 +05:30
|
|
|
#endif
|
2016-04-21 22:08:51 +05:30
|
|
|
INIT_G();
|
2006-01-25 05:38:53 +05:30
|
|
|
|
2002-09-25 08:17:48 +05:30
|
|
|
/* Initialise default values */
|
|
|
|
tar_handle = init_handle();
|
2008-06-28 10:34:09 +05:30
|
|
|
tar_handle->ah_flags = ARCHIVE_CREATE_LEADING_DIRS
|
2009-09-17 06:13:14 +05:30
|
|
|
| ARCHIVE_RESTORE_DATE
|
|
|
|
| ARCHIVE_UNLINK_OLD;
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2008-10-25 14:57:35 +05:30
|
|
|
/* Apparently only root's tar preserves perms (see bug 3844) */
|
2008-10-25 05:17:38 +05:30
|
|
|
if (getuid() != 0)
|
2009-09-17 06:13:14 +05:30
|
|
|
tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
|
2008-10-25 05:17:38 +05:30
|
|
|
|
2009-10-25 05:02:45 +05:30
|
|
|
#if ENABLE_DESKTOP
|
2015-10-22 16:52:26 +05:30
|
|
|
/* Lie to buildroot when it starts asking stupid questions. */
|
|
|
|
if (argv[1] && strcmp(argv[1], "--version") == 0) {
|
|
|
|
// Output of 'tar --version' examples:
|
|
|
|
// tar (GNU tar) 1.15.1
|
|
|
|
// tar (GNU tar) 1.25
|
|
|
|
// bsdtar 2.8.3 - libarchive 2.8.3
|
|
|
|
puts("tar (busybox) " BB_VER);
|
|
|
|
return 0;
|
|
|
|
}
|
2017-11-13 06:26:51 +05:30
|
|
|
#endif
|
|
|
|
if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') {
|
2009-10-25 05:02:45 +05:30
|
|
|
/* Compat:
|
|
|
|
* 1st argument without dash handles options with parameters
|
|
|
|
* differently from dashed one: it takes *next argv[i]*
|
2017-11-13 06:26:51 +05:30
|
|
|
* as parameter even if there are more chars in 1st argument:
|
2009-10-25 05:02:45 +05:30
|
|
|
* "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';
|
|
|
|
}
|
2017-11-13 06:26:51 +05:30
|
|
|
/* Prepend '-' to the first argument */
|
2017-08-22 21:03:06 +05:30
|
|
|
argv[1] = xasprintf("-%s", argv[1]);
|
2017-11-13 06:26:51 +05:30
|
|
|
}
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = GETOPT32(argv, "^"
|
2009-10-25 05:43:32 +05:30
|
|
|
"txC:f:Oopvk"
|
2016-07-07 01:28:02 +05:30
|
|
|
IF_FEATURE_TAR_CREATE( "ch" )
|
|
|
|
IF_FEATURE_SEAMLESS_BZ2( "j" )
|
|
|
|
IF_FEATURE_TAR_FROM( "T:*X:*")
|
|
|
|
IF_FEATURE_SEAMLESS_GZ( "z" )
|
|
|
|
IF_FEATURE_SEAMLESS_XZ( "J" )
|
|
|
|
IF_FEATURE_SEAMLESS_Z( "Z" )
|
2019-08-02 18:49:56 +05:30
|
|
|
"a"
|
2010-01-19 19:52:30 +05:30
|
|
|
IF_FEATURE_TAR_NOPRESERVE_TIME("m")
|
2019-08-02 18:49:56 +05:30
|
|
|
IF_FEATURE_TAR_LONG_OPTIONS("\xf8:") // --strip-components
|
2017-08-09 01:25:02 +05:30
|
|
|
"\0"
|
|
|
|
"tt:vv:" // count -t,-v
|
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
|
|
|
|
"\xff::" // --exclude=PATTERN is a list
|
|
|
|
#endif
|
|
|
|
IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
|
|
|
|
IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
|
|
|
|
IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
|
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS
|
2019-10-25 14:00:53 +05:30
|
|
|
":\xf8+" // --strip-components=NUM
|
2017-08-09 01:25:02 +05:30
|
|
|
#endif
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
LONGOPTS
|
2007-02-05 03:00:35 +05:30
|
|
|
, &base_dir // -C dir
|
|
|
|
, &tar_filename // -f filename
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
|
|
|
|
IF_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
|
2015-10-22 04:37:13 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_LONG_OPTIONS
|
|
|
|
, &tar_handle->tar__strip_components // --strip-components
|
|
|
|
#endif
|
2010-06-25 05:03:00 +05:30
|
|
|
IF_FEATURE_TAR_TO_COMMAND(, &(tar_handle->tar__to_command)) // --to-command
|
2007-02-05 03:00:35 +05:30
|
|
|
#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
|
2006-11-25 03:24:44 +05:30
|
|
|
);
|
2015-10-22 04:37:13 +05:30
|
|
|
#if DBG_OPTION_PARSING
|
|
|
|
bb_error_msg("opt: 0x%08x", opt);
|
2019-08-02 18:49:56 +05:30
|
|
|
# define showopt(o) bb_error_msg("opt & %s(%x):\t%x", #o, o, opt & o);
|
2015-10-22 04:37:13 +05:30
|
|
|
showopt(OPT_TEST );
|
|
|
|
showopt(OPT_EXTRACT );
|
|
|
|
showopt(OPT_BASEDIR );
|
|
|
|
showopt(OPT_TARNAME );
|
|
|
|
showopt(OPT_2STDOUT );
|
|
|
|
showopt(OPT_NOPRESERVE_OWNER);
|
|
|
|
showopt(OPT_P );
|
|
|
|
showopt(OPT_VERBOSE );
|
|
|
|
showopt(OPT_KEEP_OLD );
|
|
|
|
showopt(OPT_CREATE );
|
|
|
|
showopt(OPT_DEREFERENCE );
|
|
|
|
showopt(OPT_BZIP2 );
|
|
|
|
showopt(OPT_INCLUDE_FROM );
|
|
|
|
showopt(OPT_EXCLUDE_FROM );
|
|
|
|
showopt(OPT_GZIP );
|
|
|
|
showopt(OPT_XZ );
|
|
|
|
showopt(OPT_COMPRESS );
|
2019-08-02 18:49:56 +05:30
|
|
|
showopt(OPT_AUTOCOMPRESS_BY_EXT);
|
2015-10-22 04:37:13 +05:30
|
|
|
showopt(OPT_NOPRESERVE_TIME );
|
|
|
|
showopt(OPT_STRIP_COMPONENTS);
|
2019-08-02 18:49:56 +05:30
|
|
|
showopt(OPT_LZMA );
|
2015-10-22 04:37:13 +05:30
|
|
|
showopt(OPT_NORECURSION );
|
|
|
|
showopt(OPT_2COMMAND );
|
|
|
|
showopt(OPT_NUMERIC_OWNER );
|
|
|
|
showopt(OPT_NOPRESERVE_PERM );
|
|
|
|
showopt(OPT_OVERWRITE );
|
|
|
|
showopt(OPT_ANY_COMPRESS );
|
|
|
|
bb_error_msg("base_dir:'%s'", base_dir);
|
|
|
|
bb_error_msg("tar_filename:'%s'", tar_filename);
|
|
|
|
bb_error_msg("verboseFlag:%d", verboseFlag);
|
|
|
|
bb_error_msg("tar_handle->tar__to_command:'%s'", tar_handle->tar__to_command);
|
|
|
|
bb_error_msg("tar_handle->tar__strip_components:%u", tar_handle->tar__strip_components);
|
|
|
|
return 0;
|
|
|
|
# undef showopt
|
|
|
|
#endif
|
2008-04-29 08:13:23 +05:30
|
|
|
argv += optind;
|
2006-11-25 03:24:44 +05:30
|
|
|
|
2015-10-22 04:37:13 +05:30
|
|
|
if (verboseFlag)
|
|
|
|
tar_handle->action_header = header_verbose_list;
|
|
|
|
if (verboseFlag == 1)
|
|
|
|
tar_handle->action_header = header_list;
|
2006-11-25 03:25:55 +05:30
|
|
|
|
2006-11-26 07:16:59 +05:30
|
|
|
if (opt & OPT_EXTRACT)
|
2005-10-16 09:24:49 +05:30
|
|
|
tar_handle->action_data = data_extract_all;
|
2006-01-25 05:38:53 +05:30
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
if (opt & OPT_2STDOUT)
|
2003-11-19 01:53:04 +05:30
|
|
|
tar_handle->action_data = data_extract_to_stdout;
|
2005-10-16 09:24:49 +05:30
|
|
|
|
2010-06-25 05:03:00 +05:30
|
|
|
if (opt & OPT_2COMMAND) {
|
|
|
|
putenv((char*)"TAR_FILETYPE=f");
|
|
|
|
signal(SIGPIPE, SIG_IGN);
|
|
|
|
tar_handle->action_data = data_extract_to_command;
|
2011-03-09 01:30:36 +05:30
|
|
|
IF_FEATURE_TAR_TO_COMMAND(tar_handle->tar__to_command_shell = xstrdup(get_shell_name());)
|
2010-06-25 05:03:00 +05:30
|
|
|
}
|
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
if (opt & OPT_KEEP_OLD)
|
2009-09-17 06:13:14 +05:30
|
|
|
tar_handle->ah_flags &= ~ARCHIVE_UNLINK_OLD;
|
2005-10-16 09:24:49 +05:30
|
|
|
|
2009-04-21 06:22:21 +05:30
|
|
|
if (opt & OPT_NUMERIC_OWNER)
|
|
|
|
tar_handle->ah_flags |= ARCHIVE_NUMERIC_OWNER;
|
|
|
|
|
2009-09-17 06:13:14 +05:30
|
|
|
if (opt & OPT_NOPRESERVE_OWNER)
|
|
|
|
tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_OWNER;
|
|
|
|
|
|
|
|
if (opt & OPT_NOPRESERVE_PERM)
|
|
|
|
tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
|
|
|
|
|
2009-12-17 03:48:59 +05:30
|
|
|
if (opt & OPT_OVERWRITE) {
|
|
|
|
tar_handle->ah_flags &= ~ARCHIVE_UNLINK_OLD;
|
|
|
|
tar_handle->ah_flags |= ARCHIVE_O_TRUNC;
|
|
|
|
}
|
|
|
|
|
2010-01-19 19:52:30 +05:30
|
|
|
if (opt & OPT_NOPRESERVE_TIME)
|
|
|
|
tar_handle->ah_flags &= ~ARCHIVE_RESTORE_DATE;
|
|
|
|
|
2007-02-05 03:00:35 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_FROM
|
2021-08-02 23:28:13 +05:30
|
|
|
/* Convert each -X EXCLFILE to list of to-be-rejected glob patterns */
|
2007-02-05 03:00:35 +05:30
|
|
|
tar_handle->reject = append_file_list_to_list(tar_handle->reject);
|
2010-01-20 07:21:09 +05:30
|
|
|
# if ENABLE_FEATURE_TAR_LONG_OPTIONS
|
2021-08-02 23:28:13 +05:30
|
|
|
/* Append --exclude=GLOBPATTERNs to reject */
|
|
|
|
if (excludes) {
|
|
|
|
llist_t **p2next = &tar_handle->reject;
|
|
|
|
while (*p2next)
|
|
|
|
p2next = &((*p2next)->link);
|
|
|
|
*p2next = excludes;
|
2003-11-14 18:23:42 +05:30
|
|
|
}
|
2010-01-20 07:21:09 +05:30
|
|
|
# endif
|
2007-02-05 03:00:35 +05:30
|
|
|
tar_handle->accept = append_file_list_to_list(tar_handle->accept);
|
|
|
|
#endif
|
2003-12-26 19:31:37 +05:30
|
|
|
|
2001-10-05 08:28:48 +05:30
|
|
|
/* Setup an array of filenames to work with */
|
2010-01-20 07:21:09 +05:30
|
|
|
/* TODO: This is the same as in ar, make a separate function? */
|
2008-04-29 08:13:23 +05:30
|
|
|
while (*argv) {
|
2006-11-25 03:25:55 +05:30
|
|
|
/* kill trailing '/' unless the string is just "/" */
|
2008-04-29 08:13:23 +05:30
|
|
|
char *cp = last_char_is(*argv, '/');
|
|
|
|
if (cp > *argv)
|
2006-11-25 03:25:55 +05:30
|
|
|
*cp = '\0';
|
2008-04-29 08:13:23 +05:30
|
|
|
llist_add_to_end(&tar_handle->accept, *argv);
|
|
|
|
argv++;
|
2002-10-19 11:49:22 +05:30
|
|
|
}
|
2002-10-19 06:16:35 +05:30
|
|
|
|
2006-11-24 20:21:01 +05:30
|
|
|
if (tar_handle->accept || tar_handle->reject)
|
2002-10-19 11:49:22 +05:30
|
|
|
tar_handle->filter = filter_accept_reject_list;
|
2001-10-05 08:28:48 +05:30
|
|
|
|
2003-10-02 20:03:23 +05:30
|
|
|
/* Open the tar file */
|
|
|
|
{
|
2009-11-29 20:58:33 +05:30
|
|
|
int tar_fd = STDIN_FILENO;
|
|
|
|
int flags = O_RDONLY;
|
2003-10-02 20:03:23 +05:30
|
|
|
|
2006-11-25 03:24:44 +05:30
|
|
|
if (opt & OPT_CREATE) {
|
2010-01-20 07:21:09 +05:30
|
|
|
/* Make sure there is at least one file to tar up */
|
2005-10-16 09:24:49 +05:30
|
|
|
if (tar_handle->accept == NULL)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("empty archive");
|
2005-10-16 09:24:49 +05:30
|
|
|
|
2009-11-29 20:58:33 +05:30
|
|
|
tar_fd = STDOUT_FILENO;
|
2006-11-24 20:21:01 +05:30
|
|
|
/* Mimicking GNU tar 1.15.1: */
|
2008-08-05 18:40:34 +05:30
|
|
|
flags = O_WRONLY | O_CREAT | O_TRUNC;
|
2003-10-02 20:03:23 +05:30
|
|
|
}
|
|
|
|
|
2006-12-17 05:19:13 +05:30
|
|
|
if (LONE_DASH(tar_filename)) {
|
2009-11-29 20:58:33 +05:30
|
|
|
tar_handle->src_fd = tar_fd;
|
2006-10-08 18:19:22 +05:30
|
|
|
tar_handle->seek = seek_by_read;
|
2018-08-04 21:18:59 +05:30
|
|
|
} else
|
|
|
|
if (ENABLE_FEATURE_TAR_AUTODETECT
|
2018-11-27 15:56:48 +05:30
|
|
|
&& ENABLE_FEATURE_SEAMLESS_LZMA
|
2018-08-04 21:18:59 +05:30
|
|
|
&& flags == O_RDONLY
|
|
|
|
&& !(opt & OPT_ANY_COMPRESS)
|
2018-11-27 15:56:48 +05:30
|
|
|
&& is_suffixed_with(tar_filename, ".lzma")
|
|
|
|
/* We do this only for .lzma files, they have no signature.
|
|
|
|
* All other compression formats are recognized in
|
|
|
|
* get_header_tar() when first tar block has invalid format.
|
|
|
|
* Doing it here for all filenames would falsely trigger
|
|
|
|
* on e.g. tarball with 1st file named "BZh5".
|
|
|
|
*/
|
2018-08-04 21:18:59 +05:30
|
|
|
) {
|
|
|
|
tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0);
|
|
|
|
if (tar_handle->src_fd < 0)
|
|
|
|
bb_perror_msg_and_die("can't open '%s'", tar_filename);
|
2003-10-02 20:03:23 +05:30
|
|
|
} else {
|
2018-08-04 21:18:59 +05:30
|
|
|
tar_handle->src_fd = xopen(tar_filename, flags);
|
2019-08-02 18:49:56 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_CREATE
|
|
|
|
if ((OPT_GZIP | OPT_BZIP2 | OPT_XZ | OPT_LZMA) != 0 /* at least one is config-enabled */
|
|
|
|
&& (opt & OPT_AUTOCOMPRESS_BY_EXT)
|
|
|
|
&& flags != O_RDONLY
|
|
|
|
) {
|
|
|
|
if (OPT_GZIP != 0 && is_suffixed_with(tar_filename, "gz"))
|
|
|
|
opt |= OPT_GZIP;
|
|
|
|
if (OPT_BZIP2 != 0 && is_suffixed_with(tar_filename, "bz2"))
|
|
|
|
opt |= OPT_BZIP2;
|
|
|
|
if (OPT_XZ != 0 && is_suffixed_with(tar_filename, "xz"))
|
|
|
|
opt |= OPT_XZ;
|
|
|
|
if (OPT_LZMA != 0 && is_suffixed_with(tar_filename, "lzma"))
|
|
|
|
opt |= OPT_LZMA;
|
|
|
|
}
|
|
|
|
#endif
|
2003-10-02 20:03:23 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-13 00:09:58 +05:30
|
|
|
if (base_dir)
|
2006-08-03 23:28:17 +05:30
|
|
|
xchdir(base_dir);
|
2003-10-02 20:03:23 +05:30
|
|
|
|
2016-06-19 21:45:33 +05:30
|
|
|
#if ENABLE_FEATURE_TAR_CREATE
|
2010-01-20 07:21:09 +05:30
|
|
|
/* Create an archive */
|
2006-11-25 03:24:44 +05:30
|
|
|
if (opt & OPT_CREATE) {
|
2017-11-13 06:10:28 +05:30
|
|
|
struct TarBallInfo *tbInfo;
|
2016-06-19 21:45:33 +05:30
|
|
|
# if SEAMLESS_COMPRESSION
|
2014-12-11 20:03:07 +05:30
|
|
|
const char *zipMode = NULL;
|
|
|
|
if (opt & OPT_COMPRESS)
|
|
|
|
zipMode = "compress";
|
|
|
|
if (opt & OPT_GZIP)
|
|
|
|
zipMode = "gzip";
|
|
|
|
if (opt & OPT_BZIP2)
|
|
|
|
zipMode = "bzip2";
|
|
|
|
if (opt & OPT_LZMA)
|
|
|
|
zipMode = "lzma";
|
|
|
|
if (opt & OPT_XZ)
|
|
|
|
zipMode = "xz";
|
2017-11-13 06:10:28 +05:30
|
|
|
# endif
|
|
|
|
tbInfo = xzalloc(sizeof(*tbInfo));
|
|
|
|
tbInfo->tarFd = tar_handle->src_fd;
|
|
|
|
tbInfo->verboseFlag = verboseFlag;
|
|
|
|
# if ENABLE_FEATURE_TAR_FROM
|
|
|
|
tbInfo->excludeList = tar_handle->reject;
|
2016-06-19 21:45:33 +05:30
|
|
|
# endif
|
2006-12-18 00:38:20 +05:30
|
|
|
/* NB: writeTarFile() closes tar_handle->src_fd */
|
2017-11-13 06:10:28 +05:30
|
|
|
return writeTarFile(tbInfo,
|
2012-04-24 20:36:19 +05:30
|
|
|
(opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
|
|
|
|
| (opt & OPT_NORECURSION ? 0 : ACTION_RECURSE),
|
2006-04-18 19:47:49 +05:30
|
|
|
tar_handle->accept,
|
2017-11-13 06:10:28 +05:30
|
|
|
zipMode);
|
2002-10-19 07:48:51 +05:30
|
|
|
}
|
2016-06-19 21:45:33 +05:30
|
|
|
#endif
|
2002-10-19 11:49:22 +05:30
|
|
|
|
2012-03-06 20:57:48 +05:30
|
|
|
if (opt & OPT_ANY_COMPRESS) {
|
2014-12-07 05:14:00 +05:30
|
|
|
USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)
|
2012-03-06 20:57:48 +05:30
|
|
|
USE_FOR_NOMMU(const char *xformer_prog;)
|
|
|
|
|
2017-06-02 14:17:23 +05:30
|
|
|
if (opt & OPT_COMPRESS) {
|
|
|
|
USE_FOR_MMU(IF_FEATURE_SEAMLESS_Z(xformer = unpack_Z_stream;))
|
2012-03-06 20:57:48 +05:30
|
|
|
USE_FOR_NOMMU(xformer_prog = "uncompress";)
|
2017-06-02 14:17:23 +05:30
|
|
|
}
|
|
|
|
if (opt & OPT_GZIP) {
|
|
|
|
USE_FOR_MMU(IF_FEATURE_SEAMLESS_GZ(xformer = unpack_gz_stream;))
|
2012-03-06 20:57:48 +05:30
|
|
|
USE_FOR_NOMMU(xformer_prog = "gunzip";)
|
2017-06-02 14:17:23 +05:30
|
|
|
}
|
|
|
|
if (opt & OPT_BZIP2) {
|
|
|
|
USE_FOR_MMU(IF_FEATURE_SEAMLESS_BZ2(xformer = unpack_bz2_stream;))
|
2012-03-06 20:57:48 +05:30
|
|
|
USE_FOR_NOMMU(xformer_prog = "bunzip2";)
|
2017-06-02 14:17:23 +05:30
|
|
|
}
|
|
|
|
if (opt & OPT_LZMA) {
|
|
|
|
USE_FOR_MMU(IF_FEATURE_SEAMLESS_LZMA(xformer = unpack_lzma_stream;))
|
2012-03-06 20:57:48 +05:30
|
|
|
USE_FOR_NOMMU(xformer_prog = "unlzma";)
|
2017-06-02 14:17:23 +05:30
|
|
|
}
|
|
|
|
if (opt & OPT_XZ) {
|
|
|
|
USE_FOR_MMU(IF_FEATURE_SEAMLESS_XZ(xformer = unpack_xz_stream;))
|
2012-05-24 12:31:55 +05:30
|
|
|
USE_FOR_NOMMU(xformer_prog = "unxz";)
|
2017-06-02 14:17:23 +05:30
|
|
|
}
|
2012-03-06 20:57:48 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
fork_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
|
2012-03-06 20:57:48 +05:30
|
|
|
/* Can't lseek over pipes */
|
|
|
|
tar_handle->seek = seek_by_read;
|
|
|
|
/*tar_handle->offset = 0; - already is */
|
|
|
|
}
|
|
|
|
|
2013-11-19 21:47:48 +05:30
|
|
|
/* Zero processed headers (== empty file) is not a valid tarball.
|
|
|
|
* We (ab)use bb_got_signal as exitcode here,
|
|
|
|
* because check_errors_in_children() uses _it_ as error indicator.
|
|
|
|
*/
|
|
|
|
bb_got_signal = EXIT_FAILURE;
|
|
|
|
|
2012-03-06 20:57:48 +05:30
|
|
|
while (get_header_tar(tar_handle) == EXIT_SUCCESS)
|
2013-11-19 21:47:48 +05:30
|
|
|
bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */
|
2006-11-24 20:29:45 +05:30
|
|
|
|
2018-05-22 21:04:31 +05:30
|
|
|
create_links_from_list(tar_handle->link_placeholders);
|
2018-02-20 20:27:45 +05:30
|
|
|
|
2006-11-24 20:29:45 +05:30
|
|
|
/* Check that every file that should have been extracted was */
|
|
|
|
while (tar_handle->accept) {
|
|
|
|
if (!find_list_entry(tar_handle->reject, tar_handle->accept->data)
|
|
|
|
&& !find_list_entry(tar_handle->passed, tar_handle->accept->data)
|
|
|
|
) {
|
|
|
|
bb_error_msg_and_die("%s: not found in archive",
|
|
|
|
tar_handle->accept->data);
|
|
|
|
}
|
|
|
|
tar_handle->accept = tar_handle->accept->link;
|
|
|
|
}
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */)
|
2002-09-28 07:36:39 +05:30
|
|
|
close(tar_handle->src_fd);
|
2002-09-25 08:17:48 +05:30
|
|
|
|
2012-03-06 21:03:42 +05:30
|
|
|
if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
|
2013-11-19 21:47:48 +05:30
|
|
|
/* Set bb_got_signal to 1 if a child died with !0 exitcode */
|
2012-03-06 21:03:42 +05:30
|
|
|
check_errors_in_children(0);
|
|
|
|
}
|
2013-11-19 21:47:48 +05:30
|
|
|
|
|
|
|
return bb_got_signal;
|
2001-10-05 08:28:48 +05:30
|
|
|
}
|