mirror of
https://github.com/sheumann/hush.git
synced 2024-09-06 22:54:31 +00:00
Hi, I've spent the half night staring at the devilish my_getpwuid and my_getgrgid functions trying to find out a way to avoid actual and future potential buffer overflow problems without breaking existing code. Finally I've found a not intrusive way to do this that surely doesn't break existing code and fixes a couple of problems too. The attached patch: 1) changes the behaviour of my_getpwuid and my_getgrgid to avoid potetntial buffer overflows 2) fixes all occurences of this function calls in tar.c , id.c , ls.c, whoami.c, logger.c, libbb.h. 3) The behaviour of tar, ls and logger is unchanged. 4) The behavior of ps with somewhat longer usernames messing up output is fixed. 5) The only bigger change was the increasing of size of the buffers in id.c to avoid false negatives (unknown user: xxxxxx) with usernames longer than 8 chars. The value i used ( 32 chars ) was taken from the tar header ( see gname and uname). Maybe this buffers can be reduced a bit ( to 16 or whatever ), this is up to you. 6) The increase of size of the binary is not so dramatic: size busybox text data bss dec hex filename 239568 2300 36816 278684 4409c busybox size busybox_fixed text data bss dec hex filename 239616 2300 36816 278732 440cc busybox 7) The behaviour of whoami changed: actually it prints out an username cut down to the size of the buffer. This could be fixed by increasing the size of the buffer as in id.c or avoid the use of my_getpwuid and use getpwuid directly instead. Maybe this colud be also remain unchanged...... Please apply if you think it is ok to do so. The diff applies on today's cvs tarball (2004-08-25). Thanks in advance, Ciao, Tito
892 lines
25 KiB
C
892 lines
25 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini tar implementation for busybox
|
|
*
|
|
* Modified to use common extraction code used by ar, cpio, dpkg-deb, dpkg
|
|
* Glenn McGrath <bug1@iinet.net.au>
|
|
*
|
|
* Note, that as of BusyBox-0.43, tar has been completely rewritten from the
|
|
* ground up. It still has remnants of the old code lying about, but it is
|
|
* very different now (i.e., cleaner, less global variables, etc.)
|
|
*
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
|
*
|
|
* Based in part in the tar implementation in sash
|
|
* Copyright (c) 1999 by David I. Bell
|
|
* Permission is granted to use, distribute, or modify this source,
|
|
* provided that this copyright notice remains intact.
|
|
* Permission to distribute sash derived code under the GPL has been granted.
|
|
*
|
|
* Based in part on the tar implementation from busybox-0.28
|
|
* Copyright (C) 1995 Bruce Perens
|
|
* This is free software under the GNU General Public License.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <fcntl.h>
|
|
#include <getopt.h>
|
|
#include <search.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <fnmatch.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/sysmacros.h> /* major() and minor() */
|
|
#include "unarchive.h"
|
|
#include "busybox.h"
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_CREATE
|
|
|
|
/* Tar file constants */
|
|
# define TAR_MAGIC "ustar" /* ustar and a null */
|
|
# define TAR_VERSION " " /* Be compatable with GNU tar format */
|
|
|
|
static const int TAR_BLOCK_SIZE = 512;
|
|
static const int TAR_MAGIC_LEN = 6;
|
|
static const int TAR_VERSION_LEN = 2;
|
|
|
|
/* POSIX tar Header Block, from POSIX 1003.1-1990 */
|
|
enum { NAME_SIZE = 100 }; /* because gcc won't let me use 'static const int' */
|
|
struct TarHeader { /* byte offset */
|
|
char name[NAME_SIZE]; /* 0-99 */
|
|
char mode[8]; /* 100-107 */
|
|
char uid[8]; /* 108-115 */
|
|
char gid[8]; /* 116-123 */
|
|
char size[12]; /* 124-135 */
|
|
char mtime[12]; /* 136-147 */
|
|
char chksum[8]; /* 148-155 */
|
|
char typeflag; /* 156-156 */
|
|
char linkname[NAME_SIZE]; /* 157-256 */
|
|
char magic[6]; /* 257-262 */
|
|
char version[2]; /* 263-264 */
|
|
char uname[32]; /* 265-296 */
|
|
char gname[32]; /* 297-328 */
|
|
char devmajor[8]; /* 329-336 */
|
|
char devminor[8]; /* 337-344 */
|
|
char prefix[155]; /* 345-499 */
|
|
char padding[12]; /* 500-512 (pad to exactly the TAR_BLOCK_SIZE) */
|
|
};
|
|
typedef struct TarHeader 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;
|
|
struct HardLinkInfo {
|
|
HardLinkInfo *next; /* Next entry in list */
|
|
dev_t dev; /* Device number */
|
|
ino_t ino; /* Inode number */
|
|
short linkCount; /* (Hard) Link Count */
|
|
char name[1]; /* Start of filename (must be last) */
|
|
};
|
|
|
|
/* Some info to be carried along when creating a new tarball */
|
|
struct TarBallInfo {
|
|
char *fileName; /* File name of the tarball */
|
|
int tarFd; /* Open-for-write file descriptor
|
|
for the tarball */
|
|
struct stat statBuf; /* Stat info for the tarball, letting
|
|
us know the inode and device that the
|
|
tarball lives, so we can avoid trying
|
|
to include the tarball into itself */
|
|
int verboseFlag; /* Whether to print extra stuff or not */
|
|
const llist_t *excludeList; /* List of files to not include */
|
|
HardLinkInfo *hlInfoHead; /* Hard Link Tracking Information */
|
|
HardLinkInfo *hlInfo; /* Hard Link Info for the current file */
|
|
};
|
|
typedef struct TarBallInfo TarBallInfo;
|
|
|
|
/* A nice enum with all the possible tar file content types */
|
|
enum TarFileType {
|
|
REGTYPE = '0', /* regular file */
|
|
REGTYPE0 = '\0', /* regular file (ancient bug compat) */
|
|
LNKTYPE = '1', /* hard link */
|
|
SYMTYPE = '2', /* symbolic link */
|
|
CHRTYPE = '3', /* character special */
|
|
BLKTYPE = '4', /* block special */
|
|
DIRTYPE = '5', /* directory */
|
|
FIFOTYPE = '6', /* FIFO special */
|
|
CONTTYPE = '7', /* reserved */
|
|
GNULONGLINK = 'K', /* GNU long (>100 chars) link name */
|
|
GNULONGNAME = 'L', /* GNU long (>100 chars) file name */
|
|
};
|
|
typedef enum TarFileType TarFileType;
|
|
|
|
/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
|
|
static inline void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr,
|
|
struct stat *statbuf,
|
|
const char *name)
|
|
{
|
|
/* Note: hlInfoHeadPtr can never be NULL! */
|
|
HardLinkInfo *hlInfo;
|
|
|
|
hlInfo = (HardLinkInfo *) xmalloc(sizeof(HardLinkInfo) + strlen(name));
|
|
hlInfo->next = *hlInfoHeadPtr;
|
|
*hlInfoHeadPtr = hlInfo;
|
|
hlInfo->dev = statbuf->st_dev;
|
|
hlInfo->ino = statbuf->st_ino;
|
|
hlInfo->linkCount = statbuf->st_nlink;
|
|
strcpy(hlInfo->name, name);
|
|
}
|
|
|
|
static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr)
|
|
{
|
|
HardLinkInfo *hlInfo = NULL;
|
|
HardLinkInfo *hlInfoNext = NULL;
|
|
|
|
if (hlInfoHeadPtr) {
|
|
hlInfo = *hlInfoHeadPtr;
|
|
while (hlInfo) {
|
|
hlInfoNext = hlInfo->next;
|
|
free(hlInfo);
|
|
hlInfo = hlInfoNext;
|
|
}
|
|
*hlInfoHeadPtr = NULL;
|
|
}
|
|
return;
|
|
}
|
|
|
|
/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
|
|
static inline HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbuf)
|
|
{
|
|
while (hlInfo) {
|
|
if ((statbuf->st_ino == hlInfo->ino) && (statbuf->st_dev == hlInfo->dev))
|
|
break;
|
|
hlInfo = hlInfo->next;
|
|
}
|
|
return (hlInfo);
|
|
}
|
|
|
|
/* Put an octal string into the specified buffer.
|
|
* The number is zero and space padded and possibly null padded.
|
|
* Returns TRUE if successful. */
|
|
static int putOctal(char *cp, int len, long value)
|
|
{
|
|
int tempLength;
|
|
char tempBuffer[32];
|
|
char *tempString = tempBuffer;
|
|
|
|
/* Create a string of the specified length with an initial space,
|
|
* leading zeroes and the octal number, and a trailing null. */
|
|
sprintf(tempString, "%0*lo", len - 1, value);
|
|
|
|
/* If the string is too large, suppress the leading space. */
|
|
tempLength = strlen(tempString) + 1;
|
|
if (tempLength > len) {
|
|
tempLength--;
|
|
tempString++;
|
|
}
|
|
|
|
/* If the string is still too large, suppress the trailing null. */
|
|
if (tempLength > len)
|
|
tempLength--;
|
|
|
|
/* If the string is still too large, fail. */
|
|
if (tempLength > len)
|
|
return FALSE;
|
|
|
|
/* Copy the string to the field. */
|
|
memcpy(cp, tempString, len);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/* Write out a tar header for the specified file/directory/whatever */
|
|
static inline int writeTarHeader(struct TarBallInfo *tbInfo,
|
|
const char *header_name,
|
|
const char *real_name, struct stat *statbuf)
|
|
{
|
|
long chksum = 0;
|
|
struct TarHeader header;
|
|
const unsigned char *cp = (const unsigned char *) &header;
|
|
ssize_t size = sizeof(struct TarHeader);
|
|
|
|
memset(&header, 0, size);
|
|
|
|
strncpy(header.name, header_name, sizeof(header.name));
|
|
|
|
putOctal(header.mode, sizeof(header.mode), statbuf->st_mode);
|
|
putOctal(header.uid, sizeof(header.uid), statbuf->st_uid);
|
|
putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
|
|
putOctal(header.size, sizeof(header.size), 0); /* Regular file size is handled later */
|
|
putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime);
|
|
strncpy(header.magic, TAR_MAGIC TAR_VERSION,
|
|
TAR_MAGIC_LEN + TAR_VERSION_LEN);
|
|
|
|
/* Enter the user and group names (default to root if it fails) */
|
|
if (my_getpwuid(header.uname, statbuf->st_uid, sizeof(header.uname)) == NULL)
|
|
strcpy(header.uname, "root");
|
|
if (my_getgrgid(header.gname, statbuf->st_gid, sizeof(header.gname)) == NULL)
|
|
strcpy(header.gname, "root");
|
|
|
|
if (tbInfo->hlInfo) {
|
|
/* This is a hard link */
|
|
header.typeflag = LNKTYPE;
|
|
strncpy(header.linkname, tbInfo->hlInfo->name,
|
|
sizeof(header.linkname));
|
|
} else if (S_ISLNK(statbuf->st_mode)) {
|
|
char *lpath = xreadlink(real_name);
|
|
|
|
if (!lpath) /* Already printed err msg inside xreadlink() */
|
|
return (FALSE);
|
|
header.typeflag = SYMTYPE;
|
|
strncpy(header.linkname, lpath, sizeof(header.linkname));
|
|
free(lpath);
|
|
} else if (S_ISDIR(statbuf->st_mode)) {
|
|
header.typeflag = DIRTYPE;
|
|
strncat(header.name, "/", sizeof(header.name));
|
|
} else if (S_ISCHR(statbuf->st_mode)) {
|
|
header.typeflag = CHRTYPE;
|
|
putOctal(header.devmajor, sizeof(header.devmajor),
|
|
major(statbuf->st_rdev));
|
|
putOctal(header.devminor, sizeof(header.devminor),
|
|
minor(statbuf->st_rdev));
|
|
} else if (S_ISBLK(statbuf->st_mode)) {
|
|
header.typeflag = BLKTYPE;
|
|
putOctal(header.devmajor, sizeof(header.devmajor),
|
|
major(statbuf->st_rdev));
|
|
putOctal(header.devminor, sizeof(header.devminor),
|
|
minor(statbuf->st_rdev));
|
|
} else if (S_ISFIFO(statbuf->st_mode)) {
|
|
header.typeflag = FIFOTYPE;
|
|
} else if (S_ISREG(statbuf->st_mode)) {
|
|
header.typeflag = REGTYPE;
|
|
putOctal(header.size, sizeof(header.size), statbuf->st_size);
|
|
} else {
|
|
bb_error_msg("%s: Unknown file type", real_name);
|
|
return (FALSE);
|
|
}
|
|
|
|
/* Calculate and store the checksum (i.e., the sum of all of the bytes of
|
|
* the header). The checksum field must be filled with blanks for the
|
|
* calculation. The checksum field is formatted differently from the
|
|
* other fields: it has [6] digits, a null, then a space -- rather than
|
|
* digits, followed by a null like the other fields... */
|
|
memset(header.chksum, ' ', sizeof(header.chksum));
|
|
cp = (const unsigned char *) &header;
|
|
while (size-- > 0)
|
|
chksum += *cp++;
|
|
putOctal(header.chksum, 7, chksum);
|
|
|
|
/* Now write the header out to disk */
|
|
if ((size =
|
|
bb_full_write(tbInfo->tarFd, (char *) &header,
|
|
sizeof(struct TarHeader))) < 0) {
|
|
bb_error_msg(bb_msg_io_error, real_name);
|
|
return (FALSE);
|
|
}
|
|
/* Pad the header up to the tar block size */
|
|
for (; size < TAR_BLOCK_SIZE; size++) {
|
|
write(tbInfo->tarFd, "\0", 1);
|
|
}
|
|
/* Now do the verbose thing (or not) */
|
|
|
|
if (tbInfo->verboseFlag) {
|
|
FILE *vbFd = stdout;
|
|
|
|
if (tbInfo->tarFd == STDOUT_FILENO) /* If the archive goes to stdout, verbose to stderr */
|
|
vbFd = stderr;
|
|
|
|
fprintf(vbFd, "%s\n", header.name);
|
|
}
|
|
|
|
return (TRUE);
|
|
}
|
|
|
|
# ifdef CONFIG_FEATURE_TAR_FROM
|
|
static inline int exclude_file(const llist_t *excluded_files, const char *file)
|
|
{
|
|
while (excluded_files) {
|
|
if (excluded_files->data[0] == '/') {
|
|
if (fnmatch(excluded_files->data, file,
|
|
FNM_PATHNAME | FNM_LEADING_DIR) == 0)
|
|
return 1;
|
|
} else {
|
|
const char *p;
|
|
|
|
for (p = file; p[0] != '\0'; p++) {
|
|
if ((p == file || p[-1] == '/') && p[0] != '/' &&
|
|
fnmatch(excluded_files->data, p,
|
|
FNM_PATHNAME | FNM_LEADING_DIR) == 0)
|
|
return 1;
|
|
}
|
|
}
|
|
excluded_files = excluded_files->link;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
# endif
|
|
|
|
static int writeFileToTarball(const char *fileName, struct stat *statbuf,
|
|
void *userData)
|
|
{
|
|
struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
|
|
const char *header_name;
|
|
|
|
/*
|
|
** Check to see if we are dealing with a hard link.
|
|
** If so -
|
|
** Treat the first occurance of a given dev/inode as a file while
|
|
** treating any additional occurances as hard links. This is done
|
|
** by adding the file information to the HardLinkInfo linked list.
|
|
*/
|
|
tbInfo->hlInfo = NULL;
|
|
if (statbuf->st_nlink > 1) {
|
|
tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf);
|
|
if (tbInfo->hlInfo == NULL)
|
|
addHardLinkInfo(&tbInfo->hlInfoHead, statbuf, fileName);
|
|
}
|
|
|
|
/* It is against the rules to archive a socket */
|
|
if (S_ISSOCK(statbuf->st_mode)) {
|
|
bb_error_msg("%s: socket ignored", fileName);
|
|
return (TRUE);
|
|
}
|
|
|
|
/* It is a bad idea to store the archive we are in the process of creating,
|
|
* so check the device and inode to be sure that this particular file isn't
|
|
* the new tarball */
|
|
if (tbInfo->statBuf.st_dev == statbuf->st_dev &&
|
|
tbInfo->statBuf.st_ino == statbuf->st_ino) {
|
|
bb_error_msg("%s: file is the archive; skipping", fileName);
|
|
return (TRUE);
|
|
}
|
|
|
|
header_name = fileName;
|
|
while (header_name[0] == '/') {
|
|
static int alreadyWarned = FALSE;
|
|
|
|
if (alreadyWarned == FALSE) {
|
|
bb_error_msg("Removing leading '/' from member names");
|
|
alreadyWarned = TRUE;
|
|
}
|
|
header_name++;
|
|
}
|
|
|
|
if (strlen(fileName) >= NAME_SIZE) {
|
|
bb_error_msg(bb_msg_name_longer_than_foo, NAME_SIZE);
|
|
return (TRUE);
|
|
}
|
|
|
|
if (header_name[0] == '\0')
|
|
return TRUE;
|
|
|
|
# ifdef CONFIG_FEATURE_TAR_FROM
|
|
if (exclude_file(tbInfo->excludeList, header_name)) {
|
|
return SKIP;
|
|
}
|
|
# endif /* CONFIG_FEATURE_TAR_FROM */
|
|
|
|
if (writeTarHeader(tbInfo, header_name, fileName, statbuf) == FALSE) {
|
|
return (FALSE);
|
|
}
|
|
|
|
/* Now, if the file is a regular file, copy it out to the tarball */
|
|
if ((tbInfo->hlInfo == NULL)
|
|
&& (S_ISREG(statbuf->st_mode))) {
|
|
int inputFileFd;
|
|
ssize_t readSize = 0;
|
|
|
|
/* open the file we want to archive, and make sure all is well */
|
|
if ((inputFileFd = open(fileName, O_RDONLY)) < 0) {
|
|
bb_perror_msg("%s: Cannot open", fileName);
|
|
return (FALSE);
|
|
}
|
|
|
|
/* write the file to the archive */
|
|
readSize = bb_copyfd_eof(inputFileFd, tbInfo->tarFd);
|
|
|
|
/* Pad the file up to the tar block size */
|
|
for (; (readSize % TAR_BLOCK_SIZE) != 0; readSize++) {
|
|
write(tbInfo->tarFd, "\0", 1);
|
|
}
|
|
close(inputFileFd);
|
|
}
|
|
|
|
return (TRUE);
|
|
}
|
|
|
|
static inline int writeTarFile(const int tar_fd, const int verboseFlag,
|
|
const unsigned long dereferenceFlag, const llist_t *include,
|
|
const llist_t *exclude, const int gzip)
|
|
{
|
|
#ifdef CONFIG_FEATURE_TAR_GZIP
|
|
int gzipDataPipe[2] = { -1, -1 };
|
|
int gzipStatusPipe[2] = { -1, -1 };
|
|
pid_t gzipPid = 0;
|
|
volatile int vfork_exec_errno = 0;
|
|
#endif
|
|
|
|
int errorFlag = FALSE;
|
|
ssize_t size;
|
|
struct TarBallInfo tbInfo;
|
|
|
|
tbInfo.hlInfoHead = NULL;
|
|
|
|
fchmod(tar_fd, 0644);
|
|
tbInfo.tarFd = tar_fd;
|
|
tbInfo.verboseFlag = verboseFlag;
|
|
|
|
/* Store the stat info for the tarball's file, so
|
|
* can avoid including the tarball into itself.... */
|
|
if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0)
|
|
bb_perror_msg_and_die("Couldnt stat tar file");
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_GZIP
|
|
if (gzip) {
|
|
if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) {
|
|
bb_perror_msg_and_die("Failed to create gzip pipe");
|
|
}
|
|
|
|
signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
|
|
|
|
# if __GNUC__
|
|
/* Avoid vfork clobbering */
|
|
(void) &include;
|
|
(void) &errorFlag;
|
|
# endif
|
|
|
|
gzipPid = vfork();
|
|
|
|
if (gzipPid == 0) {
|
|
dup2(gzipDataPipe[0], 0);
|
|
close(gzipDataPipe[1]);
|
|
|
|
if (tbInfo.tarFd != 1)
|
|
dup2(tbInfo.tarFd, 1);
|
|
|
|
close(gzipStatusPipe[0]);
|
|
fcntl(gzipStatusPipe[1], F_SETFD, FD_CLOEXEC); /* close on exec shows sucess */
|
|
|
|
execl("/bin/gzip", "gzip", "-f", 0);
|
|
vfork_exec_errno = errno;
|
|
|
|
close(gzipStatusPipe[1]);
|
|
exit(-1);
|
|
} else if (gzipPid > 0) {
|
|
close(gzipDataPipe[0]);
|
|
close(gzipStatusPipe[1]);
|
|
|
|
while (1) {
|
|
char buf;
|
|
|
|
int n = bb_full_read(gzipStatusPipe[0], &buf, 1);
|
|
|
|
if (n == 0 && vfork_exec_errno != 0) {
|
|
errno = vfork_exec_errno;
|
|
bb_perror_msg_and_die("Could not exec gzip process");
|
|
} else if ((n < 0) && (errno == EAGAIN || errno == EINTR))
|
|
continue; /* try it again */
|
|
break;
|
|
}
|
|
close(gzipStatusPipe[0]);
|
|
|
|
tbInfo.tarFd = gzipDataPipe[1];
|
|
} else {
|
|
bb_perror_msg_and_die("Failed to vfork gzip process");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
tbInfo.excludeList = exclude;
|
|
|
|
/* Read the directory/files and iterate over them one at a time */
|
|
while (include) {
|
|
if (!recursive_action(include->data, TRUE, dereferenceFlag, FALSE,
|
|
writeFileToTarball, writeFileToTarball,
|
|
(void *) &tbInfo)) {
|
|
errorFlag = TRUE;
|
|
}
|
|
include = include->link;
|
|
}
|
|
/* Write two empty blocks to the end of the archive */
|
|
for (size = 0; size < (2 * TAR_BLOCK_SIZE); size++) {
|
|
write(tbInfo.tarFd, "\0", 1);
|
|
}
|
|
|
|
/* To be pedantically correct, we would check if the tarball
|
|
* is smaller than 20 tar blocks, and pad it if it was smaller,
|
|
* but that isn't necessary for GNU tar interoperability, and
|
|
* so is considered a waste of space */
|
|
|
|
/* Hang up the tools, close up shop, head home */
|
|
close(tbInfo.tarFd);
|
|
if (errorFlag)
|
|
bb_error_msg("Error exit delayed from previous errors");
|
|
|
|
freeHardLinkInfo(&tbInfo.hlInfoHead);
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_GZIP
|
|
if (gzip && gzipPid) {
|
|
if (waitpid(gzipPid, NULL, 0) == -1)
|
|
printf("Couldnt wait ?");
|
|
}
|
|
#endif
|
|
|
|
return !errorFlag;
|
|
}
|
|
#endif /* tar_create */
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_FROM
|
|
static llist_t *append_file_list_to_list(llist_t *list)
|
|
{
|
|
FILE *src_stream;
|
|
llist_t *cur = list;
|
|
llist_t *tmp;
|
|
char *line;
|
|
llist_t *newlist = NULL;
|
|
|
|
while(cur) {
|
|
src_stream = bb_xfopen(cur->data, "r");
|
|
tmp = cur;
|
|
cur = cur->link;
|
|
free(tmp);
|
|
while((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
|
|
newlist = llist_add_to(newlist, line);
|
|
}
|
|
fclose(src_stream);
|
|
}
|
|
return newlist;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_COMPRESS
|
|
static char get_header_tar_Z(archive_handle_t *archive_handle)
|
|
{
|
|
/* Cant lseek over pipe's */
|
|
archive_handle->seek = seek_by_char;
|
|
|
|
/* do the decompression, and cleanup */
|
|
if ((bb_xread_char(archive_handle->src_fd) != 0x1f) || (bb_xread_char(archive_handle->src_fd) != 0x9d)) {
|
|
bb_error_msg_and_die("Invalid magic");
|
|
}
|
|
|
|
archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress);
|
|
archive_handle->offset = 0;
|
|
while (get_header_tar(archive_handle) == EXIT_SUCCESS);
|
|
|
|
/* Can only do one file at a time */
|
|
return(EXIT_FAILURE);
|
|
}
|
|
#endif
|
|
|
|
#define CTX_TEST (1 << 0)
|
|
#define CTX_EXTRACT (1 << 1)
|
|
#define TAR_OPT_BASEDIR (1 << 2)
|
|
#define TAR_OPT_TARNAME (1 << 3)
|
|
#define TAR_OPT_2STDOUT (1 << 4)
|
|
#define TAR_OPT_P (1 << 5)
|
|
#define TAR_OPT_VERBOSE (1 << 6)
|
|
#define TAR_OPT_KEEP_OLD (1 << 7)
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_CREATE
|
|
# define CTX_CREATE (1 << 8)
|
|
# define TAR_OPT_DEREFERNCE (1 << 9)
|
|
# define TAR_OPT_STR_CREATE "ch"
|
|
# define TAR_OPT_FLAG_CREATE 2
|
|
#else
|
|
//# define CTX_CREATE 0
|
|
# define TAR_OPT_STR_CREATE ""
|
|
# define TAR_OPT_FLAG_CREATE 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_BZIP2
|
|
# define TAR_OPT_BZIP2 (1 << (8 + TAR_OPT_FLAG_CREATE))
|
|
# define TAR_OPT_STR_BZIP2 "j"
|
|
# define TAR_OPT_FLAG_BZIP2 1
|
|
#else
|
|
# define TAR_OPT_STR_BZIP2 ""
|
|
# define TAR_OPT_FLAG_BZIP2 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_FROM
|
|
# define TAR_OPT_INCLUDE_FROM (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2))
|
|
# define TAR_OPT_EXCLUDE_FROM (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + 1))
|
|
# define TAR_OPT_STR_FROM "T:X:"
|
|
# define TAR_OPT_FLAG_FROM 2
|
|
#else
|
|
# define TAR_OPT_STR_FROM ""
|
|
# define TAR_OPT_FLAG_FROM 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_GZIP
|
|
# define TAR_OPT_GZIP (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM))
|
|
# define TAR_OPT_STR_GZIP "z"
|
|
# define TAR_OPT_FLAG_GZIP 1
|
|
#else
|
|
# define TAR_OPT_STR_GZIP ""
|
|
# define TAR_OPT_FLAG_GZIP 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_COMPRESS
|
|
# define TAR_OPT_UNCOMPRESS (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM + TAR_OPT_FLAG_GZIP))
|
|
# define TAR_OPT_STR_COMPRESS "Z"
|
|
#else
|
|
# define TAR_OPT_STR_COMPRESS ""
|
|
#endif
|
|
|
|
static const char tar_options[]="txC:f:Opvk" \
|
|
TAR_OPT_STR_CREATE \
|
|
TAR_OPT_STR_BZIP2 \
|
|
TAR_OPT_STR_FROM \
|
|
TAR_OPT_STR_GZIP \
|
|
TAR_OPT_STR_COMPRESS;
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
|
|
static const struct option tar_long_options[] = {
|
|
{ "list", 0, NULL, 't' },
|
|
{ "extract", 0, NULL, 'x' },
|
|
{ "directory", 1, NULL, 'C' },
|
|
{ "file", 1, NULL, 'f' },
|
|
{ "to-stdout", 0, NULL, 'O' },
|
|
{ "same-permissions", 0, NULL, 'p' },
|
|
{ "verbose", 0, NULL, 'v' },
|
|
{ "keep-old", 0, NULL, 'k' },
|
|
# ifdef CONFIG_FEATURE_TAR_CREATE
|
|
{ "create", 0, NULL, 'c' },
|
|
{ "dereference", 0, NULL, 'h' },
|
|
# endif
|
|
# ifdef CONFIG_FEATURE_TAR_BZIP2
|
|
{ "bzip2", 0, NULL, 'j' },
|
|
# endif
|
|
# ifdef CONFIG_FEATURE_TAR_FROM
|
|
{ "files-from", 1, NULL, 'T' },
|
|
{ "exclude-from", 1, NULL, 'X' },
|
|
# endif
|
|
# ifdef CONFIG_FEATURE_TAR_GZIP
|
|
{ "gzip", 0, NULL, 'z' },
|
|
# endif
|
|
# ifdef CONFIG_FEATURE_TAR_COMPRESS
|
|
{ "compress", 0, NULL, 'Z' },
|
|
# endif
|
|
{ 0, 0, 0, 0 }
|
|
};
|
|
#endif
|
|
|
|
int tar_main(int argc, char **argv)
|
|
{
|
|
char (*get_header_ptr)(archive_handle_t *) = get_header_tar;
|
|
archive_handle_t *tar_handle;
|
|
char *base_dir = NULL;
|
|
const char *tar_filename = "-";
|
|
unsigned long opt;
|
|
unsigned long ctx_flag = 0;
|
|
|
|
if (argc < 2) {
|
|
bb_show_usage();
|
|
}
|
|
|
|
/* Prepend '-' to the first argument if required */
|
|
if (argv[1][0] != '-') {
|
|
char *tmp;
|
|
|
|
bb_xasprintf(&tmp, "-%s", argv[1]);
|
|
argv[1] = tmp;
|
|
}
|
|
|
|
/* Initialise default values */
|
|
tar_handle = init_handle();
|
|
tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL;
|
|
|
|
bb_opt_complementaly = "c~tx:t~cx:x~ct:X*:T*";
|
|
#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
|
|
bb_applet_long_options = tar_long_options;
|
|
#endif
|
|
|
|
opt = bb_getopt_ulflags(argc, argv, tar_options,
|
|
&base_dir, /* Change to dir <optarg> */
|
|
&tar_filename /* archive filename */
|
|
#ifdef CONFIG_FEATURE_TAR_FROM
|
|
, &(tar_handle->accept),
|
|
&(tar_handle->reject)
|
|
#endif
|
|
);
|
|
|
|
/* Check one and only one context option was given */
|
|
if(opt & 0x80000000UL) {
|
|
bb_show_usage();
|
|
}
|
|
#ifdef CONFIG_FEATURE_TAR_CREATE
|
|
ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT);
|
|
#else
|
|
ctx_flag = opt & (CTX_TEST | CTX_EXTRACT);
|
|
#endif
|
|
if (ctx_flag == 0) {
|
|
bb_show_usage();
|
|
}
|
|
if(ctx_flag & CTX_TEST) {
|
|
if ((tar_handle->action_header == header_list) ||
|
|
(tar_handle->action_header == header_verbose_list)) {
|
|
tar_handle->action_header = header_verbose_list;
|
|
} else {
|
|
tar_handle->action_header = header_list;
|
|
}
|
|
}
|
|
if(ctx_flag & CTX_EXTRACT) {
|
|
if (tar_handle->action_data != data_extract_to_stdout)
|
|
tar_handle->action_data = data_extract_all;
|
|
}
|
|
if(opt & TAR_OPT_2STDOUT) {
|
|
/* To stdout */
|
|
tar_handle->action_data = data_extract_to_stdout;
|
|
}
|
|
if(opt & TAR_OPT_VERBOSE) {
|
|
if ((tar_handle->action_header == header_list) ||
|
|
(tar_handle->action_header == header_verbose_list))
|
|
{
|
|
tar_handle->action_header = header_verbose_list;
|
|
} else {
|
|
tar_handle->action_header = header_list;
|
|
}
|
|
}
|
|
if (opt & TAR_OPT_KEEP_OLD) {
|
|
tar_handle->flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL;
|
|
}
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_GZIP
|
|
if(opt & TAR_OPT_GZIP) {
|
|
get_header_ptr = get_header_tar_gz;
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_FEATURE_TAR_BZIP2
|
|
if(opt & TAR_OPT_BZIP2) {
|
|
get_header_ptr = get_header_tar_bz2;
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_FEATURE_TAR_COMPRESS
|
|
if(opt & TAR_OPT_UNCOMPRESS) {
|
|
get_header_ptr = get_header_tar_Z;
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_FEATURE_TAR_FROM
|
|
if(opt & TAR_OPT_EXCLUDE_FROM) {
|
|
tar_handle->reject = append_file_list_to_list(tar_handle->reject);
|
|
}
|
|
if(opt & TAR_OPT_INCLUDE_FROM) {
|
|
tar_handle->accept = append_file_list_to_list(tar_handle->accept);
|
|
}
|
|
#endif
|
|
|
|
/* Check if we are reading from stdin */
|
|
if ((argv[optind]) && (*argv[optind] == '-')) {
|
|
/* Default is to read from stdin, so just skip to next arg */
|
|
optind++;
|
|
}
|
|
|
|
/* Setup an array of filenames to work with */
|
|
/* TODO: This is the same as in ar, separate function ? */
|
|
while (optind < argc) {
|
|
char *filename_ptr = last_char_is(argv[optind], '/');
|
|
if (filename_ptr) {
|
|
*filename_ptr = '\0';
|
|
}
|
|
tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
|
|
optind++;
|
|
}
|
|
|
|
if ((tar_handle->accept) || (tar_handle->reject)) {
|
|
tar_handle->filter = filter_accept_reject_list;
|
|
}
|
|
|
|
/* Open the tar file */
|
|
{
|
|
FILE *tar_stream;
|
|
int flags;
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_CREATE
|
|
if (opt & CTX_CREATE) {
|
|
/* Make sure there is at least one file to tar up. */
|
|
if (tar_handle->accept == NULL) {
|
|
bb_error_msg_and_die("Cowardly refusing to create an empty archive");
|
|
}
|
|
tar_stream = stdout;
|
|
flags = O_WRONLY | O_CREAT | O_EXCL;
|
|
unlink(tar_filename);
|
|
} else
|
|
#endif
|
|
{
|
|
tar_stream = stdin;
|
|
flags = O_RDONLY;
|
|
}
|
|
|
|
if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) {
|
|
tar_handle->src_fd = fileno(tar_stream);
|
|
tar_handle->seek = seek_by_char;
|
|
} else {
|
|
tar_handle->src_fd = bb_xopen(tar_filename, flags);
|
|
}
|
|
}
|
|
|
|
if ((base_dir) && (chdir(base_dir))) {
|
|
bb_perror_msg_and_die("Couldnt chdir to %s", base_dir);
|
|
}
|
|
|
|
#ifdef CONFIG_FEATURE_TAR_CREATE
|
|
/* create an archive */
|
|
if (opt & CTX_CREATE) {
|
|
int verboseFlag = FALSE;
|
|
int gzipFlag = FALSE;
|
|
|
|
# ifdef CONFIG_FEATURE_TAR_GZIP
|
|
if (get_header_ptr == get_header_tar_gz) {
|
|
gzipFlag = TRUE;
|
|
}
|
|
# endif /* CONFIG_FEATURE_TAR_GZIP */
|
|
# ifdef CONFIG_FEATURE_TAR_BZIP2
|
|
if (get_header_ptr == get_header_tar_bz2) {
|
|
bb_error_msg_and_die("Creating bzip2 compressed archives is not currently supported.");
|
|
}
|
|
# endif /* CONFIG_FEATURE_TAR_BZIP2 */
|
|
|
|
if ((tar_handle->action_header == header_list) ||
|
|
(tar_handle->action_header == header_verbose_list)) {
|
|
verboseFlag = TRUE;
|
|
}
|
|
writeTarFile(tar_handle->src_fd, verboseFlag, opt & TAR_OPT_DEREFERNCE, tar_handle->accept,
|
|
tar_handle->reject, gzipFlag);
|
|
} else
|
|
#endif /* CONFIG_FEATURE_TAR_CREATE */
|
|
{
|
|
while (get_header_ptr(tar_handle) == EXIT_SUCCESS);
|
|
|
|
/* Ckeck that every file that should have been extracted was */
|
|
while (tar_handle->accept) {
|
|
if (find_list_entry(tar_handle->reject, tar_handle->accept->data) == NULL) {
|
|
if (find_list_entry(tar_handle->passed, tar_handle->accept->data) == NULL) {
|
|
bb_error_msg_and_die("%s: Not found in archive\n", tar_handle->accept->data);
|
|
}
|
|
}
|
|
tar_handle->accept = tar_handle->accept->link;
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
if (tar_handle->src_fd != STDIN_FILENO) {
|
|
close(tar_handle->src_fd);
|
|
}
|
|
#endif /* CONFIG_FEATURE_CLEAN_UP */
|
|
|
|
return(EXIT_SUCCESS);
|
|
}
|