X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Ftar.c;h=bcbb7a9945f469ef437c3e2a5db2542f6a575d9f;hb=e8feca085dbcd0fb97aa5af1a8e751affb88df48;hp=5d9e870fa3dab3e0c794bb65ffe4c0f66db606dd;hpb=1bfca7bac7c379e7d42387851d6f689d60f749d8;p=oweals%2Fbusybox.git diff --git a/archival/tar.c b/archival/tar.c index 5d9e870fa..bcbb7a994 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -23,42 +23,45 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "busybox.h" -#include "unarchive.h" #include #include +#include "libbb.h" +#include "unarchive.h" -#ifdef CONFIG_FEATURE_TAR_CREATE +#define block_buf bb_common_bufsiz1 + +#if ENABLE_FEATURE_TAR_CREATE /* Tar file constants */ #define TAR_BLOCK_SIZE 512 /* POSIX tar Header Block, from POSIX 1003.1-1990 */ -#define NAME_SIZE 100 -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) */ -}; +#define NAME_SIZE 100 +#define NAME_SIZE_STR "100" typedef struct TarHeader TarHeader; +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) */ +}; /* -** writeTarFile(), writeFileToTarball(), and writeTarHeader() are +** writeTarFile(), writeFileToTarball(), and writeTarHeader() are ** the only functions that deal with the HardLinkInfo structure. ** Even these functions use the xxxHardLinkInfo() functions. */ @@ -72,6 +75,7 @@ struct HardLinkInfo { }; /* Some info to be carried along when creating a new tarball */ +typedef struct TarBallInfo TarBallInfo; struct TarBallInfo { int tarFd; /* Open-for-write file descriptor for the tarball */ @@ -84,7 +88,6 @@ struct TarBallInfo { 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 { @@ -121,8 +124,8 @@ static void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr, static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr) { - HardLinkInfo *hlInfo = NULL; - HardLinkInfo *hlInfoNext = NULL; + HardLinkInfo *hlInfo; + HardLinkInfo *hlInfoNext; if (hlInfoHeadPtr) { hlInfo = *hlInfoHeadPtr; @@ -133,7 +136,6 @@ static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr) } *hlInfoHeadPtr = NULL; } - return; } /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */ @@ -148,132 +150,209 @@ static HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbu } /* 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) + * The number is zero padded and possibly null terminated. + * Stores low-order bits only if whole value does not fit. */ +static void putOctal(char *cp, int len, off_t value) { - int tempLength; - char tempBuffer[32]; + char tempBuffer[sizeof(off_t)*3+1]; char *tempString = tempBuffer; + int width; - /* 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); + width = sprintf(tempBuffer, "%0*"OFF_FMT"o", len, value); + tempString += (width - len); - /* If the string is too large, suppress the leading space. */ - tempLength = strlen(tempString) + 1; - if (tempLength > len) { - tempLength--; + /* 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++; - } - /* If the string is still too large, suppress the trailing null. */ - if (tempLength > len) - tempLength--; + /* Copy the string to the field */ + memcpy(cp, tempString, len); +} +#define PUT_OCTAL(a, b) putOctal((a), sizeof(a), (b)) - /* If the string is still too large, fail. */ - if (tempLength > len) - return FALSE; +static void chksum_and_xwrite(int fd, struct TarHeader* hp) +{ + /* POSIX says that checksum is done on unsigned bytes + * (Sun and HP-UX gets it wrong... more details in + * GNU tar source) */ + const unsigned char *cp; + int chksum, size; - /* Copy the string to the field. */ - memcpy(cp, tempString, len); + strcpy(hp->magic, "ustar "); - return TRUE; + /* 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(hp->chksum, ' ', sizeof(hp->chksum)); + cp = (const unsigned char *) hp; + chksum = 0; + size = sizeof(*hp); + do { chksum += *cp++; } while (--size); + putOctal(hp->chksum, sizeof(hp->chksum)-1, chksum); + + /* Now write the header out to disk */ + xwrite(fd, hp, sizeof(*hp)); +} + +#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS +static void writeLongname(int fd, int type, const char *name, int dir) +{ + static const struct { + 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 */ + } prefilled = { + "0000000", + "0000000", + "0000000", + "00000000000", + "00000000000", + }; + struct TarHeader header; + int size; + + dir = !!dir; /* normalize: 0/1 */ + size = strlen(name) + 1 + dir; /* GNU tar uses strlen+1 */ + /* + dir: account for possible '/' */ + + memset(&header, 0, sizeof(header)); + strcpy(header.name, "././@LongLink"); + memcpy(header.mode, prefilled.mode, sizeof(prefilled)); + PUT_OCTAL(header.size, size); + header.typeflag = type; + chksum_and_xwrite(fd, &header); + + /* Write filename[/] and pad the block. */ + /* dir=0: writes 'name', pads */ + /* dir=1: writes 'name', writes '/', pads */ + dir *= 2; + xwrite(fd, name, size - dir); + xwrite(fd, "/", dir); + size = (-size) & (TAR_BLOCK_SIZE-1); + memset(&header, 0, size); + xwrite(fd, &header, size); } +#endif /* Write out a tar header for the specified file/directory/whatever */ +void BUG_tar_header_size(void); static int writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name, const char *fileName, struct stat *statbuf) { - long chksum = 0; struct TarHeader header; - const unsigned char *cp = (const unsigned char *) &header; - ssize_t size = sizeof(struct TarHeader); - bzero(&header, size); + if (sizeof(header) != 512) + BUG_tar_header_size(); + + memset(&header, 0, sizeof(struct TarHeader)); - safe_strncpy(header.name, header_name, sizeof(header.name)); + 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); - strcpy(header.magic, "ustar "); + /* POSIX says to mask mode with 07777. */ + PUT_OCTAL(header.mode, statbuf->st_mode & 07777); + PUT_OCTAL(header.uid, statbuf->st_uid); + PUT_OCTAL(header.gid, statbuf->st_gid); + memset(header.size, '0', sizeof(header.size)-1); /* Regular file size is handled later */ + PUT_OCTAL(header.mtime, statbuf->st_mtime); - /* Enter the user and group names (default to root if it fails) */ - if (bb_getpwuid(header.uname, statbuf->st_uid, sizeof(header.uname)) == NULL) - strcpy(header.uname, "root"); - if (bb_getgrgid(header.gname, statbuf->st_gid, sizeof(header.gname)) == NULL) - strcpy(header.gname, "root"); + /* 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)); if (tbInfo->hlInfo) { /* This is a hard link */ header.typeflag = LNKTYPE; strncpy(header.linkname, tbInfo->hlInfo->name, sizeof(header.linkname)); +#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS + /* Write out long linkname if needed */ + if (header.linkname[sizeof(header.linkname)-1]) + writeLongname(tbInfo->tarFd, GNULONGLINK, + tbInfo->hlInfo->name, 0); +#endif } else if (S_ISLNK(statbuf->st_mode)) { - char *lpath = xreadlink(fileName); - - if (!lpath) /* Already printed err msg inside xreadlink() */ + char *lpath = xmalloc_readlink_or_warn(fileName); + if (!lpath) return FALSE; header.typeflag = SYMTYPE; strncpy(header.linkname, lpath, sizeof(header.linkname)); +#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS + /* Write out long linkname if needed */ + if (header.linkname[sizeof(header.linkname)-1]) + writeLongname(tbInfo->tarFd, GNULONGLINK, lpath, 0); +#else + /* If it is larger than 100 bytes, bail out */ + if (header.linkname[sizeof(header.linkname)-1]) { + free(lpath); + bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); + return FALSE; + } +#endif free(lpath); } else if (S_ISDIR(statbuf->st_mode)) { header.typeflag = DIRTYPE; - strncat(header.name, "/", sizeof(header.name)); + /* Append '/' only if there is a space for it */ + if (!header.name[sizeof(header.name)-1]) + header.name[strlen(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)); + PUT_OCTAL(header.devmajor, major(statbuf->st_rdev)); + PUT_OCTAL(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)); + PUT_OCTAL(header.devmajor, major(statbuf->st_rdev)); + PUT_OCTAL(header.devminor, minor(statbuf->st_rdev)); } else if (S_ISFIFO(statbuf->st_mode)) { header.typeflag = FIFOTYPE; } else if (S_ISREG(statbuf->st_mode)) { + if (sizeof(statbuf->st_size) > 4 + && statbuf->st_size > (off_t)0777777777777LL + ) { + bb_error_msg_and_die("cannot store file '%s' " + "of size %"OFF_FMT"d, aborting", + fileName, statbuf->st_size); + } header.typeflag = REGTYPE; - putOctal(header.size, sizeof(header.size), statbuf->st_size); + PUT_OCTAL(header.size, statbuf->st_size); } else { bb_error_msg("%s: unknown file type", fileName); 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); +#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS + /* 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)); +#endif /* Now write the header out to disk */ - xwrite(tbInfo->tarFd, &header, sizeof(struct TarHeader)); + chksum_and_xwrite(tbInfo->tarFd, &header); /* 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); + /* GNU "tar cvvf" prints "extended" listing a-la "ls -l" */ + /* We don't have such excesses here: for us "v" == "vv" */ + /* '/' is probably a GNUism */ + fprintf(vbFd, "%s%s\n", header_name, + S_ISDIR(statbuf->st_mode) ? "/" : ""); } return TRUE; } -# ifdef CONFIG_FEATURE_TAR_FROM +#if ENABLE_FEATURE_TAR_FROM static int exclude_file(const llist_t *excluded_files, const char *file) { while (excluded_files) { @@ -296,12 +375,12 @@ static int exclude_file(const llist_t *excluded_files, const char *file) return 0; } -# else +#else #define exclude_file(excluded_files, file) 0 -# endif +#endif static int writeFileToTarball(const char *fileName, struct stat *statbuf, - void *userData) + void *userData, int depth ATTRIBUTE_UNUSED) { struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData; const char *header_name; @@ -338,33 +417,33 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, header_name = fileName; while (header_name[0] == '/') { - static int alreadyWarned = FALSE; + static smallint warned; - if (alreadyWarned == FALSE) { + if (!warned) { bb_error_msg("removing leading '/' from member names"); - alreadyWarned = TRUE; + warned = 1; } header_name++; } +#if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS if (strlen(fileName) >= NAME_SIZE) { - bb_error_msg(bb_msg_name_longer_than_foo, NAME_SIZE); + bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); return TRUE; } +#endif if (header_name[0] == '\0') return TRUE; - if (ENABLE_FEATURE_TAR_FROM && - exclude_file(tbInfo->excludeList, header_name)) { + if (exclude_file(tbInfo->excludeList, header_name)) return SKIP; - } /* Is this a regular file? */ - if ((tbInfo->hlInfo == NULL) && (S_ISREG(statbuf->st_mode))) { + if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) { /* 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); + inputFileFd = open_or_warn(fileName, O_RDONLY); + if (inputFileFd < 0) { return FALSE; } } @@ -376,16 +455,30 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, /* If it was a regular file, write out the body */ if (inputFileFd >= 0) { - ssize_t readSize = 0; + size_t readSize; + /* Write the file to the archive. */ + /* 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); + ////} + + /* Check that file did not grow in between? */ + /* if (safe_read(inputFileFd, 1) == 1) warn but continue? */ - /* write the file to the archive */ - readSize = bb_copyfd_eof(inputFileFd, tbInfo->tarFd); close(inputFileFd); /* Pad the file up to the tar block size */ - readSize = (TAR_BLOCK_SIZE - readSize) & (TAR_BLOCK_SIZE-1); - bzero(bb_common_bufsiz1, readSize); - xwrite(tbInfo->tarFd, bb_common_bufsiz1, readSize); + /* (a few tricks here in the name of code size) */ + readSize = (-(int)statbuf->st_size) & (TAR_BLOCK_SIZE-1); + memset(block_buf, 0, readSize); + xwrite(tbInfo->tarFd, block_buf, readSize); } return TRUE; @@ -414,20 +507,19 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, int gzipDataPipe[2] = { -1, -1 }; int gzipStatusPipe[2] = { -1, -1 }; volatile int vfork_exec_errno = 0; - char *zip_exec = (gzip == 1) ? "gzip" : "bzip2"; - + const char *zip_exec = (gzip == 1) ? "gzip" : "bzip2"; - if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) - bb_perror_msg_and_die("pipe"); + xpipe(gzipDataPipe); + xpipe(gzipStatusPipe); - signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */ + signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */ -# if __GNUC__ - /* Avoid vfork clobbering */ - (void) &include; - (void) &errorFlag; - (void) &zip_exec; -# endif +#if defined(__GNUC__) && __GNUC__ + /* Avoid vfork clobbering */ + (void) &include; + (void) &errorFlag; + (void) &zip_exec; +#endif gzipPid = vfork(); @@ -435,13 +527,12 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, dup2(gzipDataPipe[0], 0); close(gzipDataPipe[1]); - if (tbInfo.tarFd != 1) - dup2(tbInfo.tarFd, 1); + dup2(tbInfo.tarFd, 1); close(gzipStatusPipe[0]); fcntl(gzipStatusPipe[1], F_SETFD, FD_CLOEXEC); /* close on exec shows success */ - execlp(zip_exec, zip_exec, "-f", NULL); + BB_EXECLP(zip_exec, zip_exec, "-f", NULL); vfork_exec_errno = errno; close(gzipStatusPipe[1]); @@ -457,7 +548,7 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, if (n == 0 && vfork_exec_errno != 0) { errno = vfork_exec_errno; - bb_perror_msg_and_die("Could not exec %s", zip_exec); + bb_perror_msg_and_die("cannot exec %s", zip_exec); } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) continue; /* try it again */ break; @@ -472,16 +563,17 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, /* Read the directory/files and iterate over them one at a time */ while (include) { - if (!recursive_action(include->data, TRUE, dereferenceFlag, - FALSE, writeFileToTarball, writeFileToTarball, &tbInfo)) + if (!recursive_action(include->data, ACTION_RECURSE | + (dereferenceFlag ? ACTION_FOLLOWLINKS : 0), + writeFileToTarball, writeFileToTarball, &tbInfo, 0)) { errorFlag = TRUE; } include = include->link; } /* Write two empty blocks to the end of the archive */ - bzero(bb_common_bufsiz1, 2*TAR_BLOCK_SIZE); - xwrite(tbInfo.tarFd, bb_common_bufsiz1, 2*TAR_BLOCK_SIZE); + memset(block_buf, 0, 2*TAR_BLOCK_SIZE); + xwrite(tbInfo.tarFd, block_buf, 2*TAR_BLOCK_SIZE); /* To be pedantically correct, we would check if the tarball * is smaller than 20 tar blocks, and pad it if it was smaller, @@ -496,20 +588,25 @@ static int writeTarFile(const int tar_fd, const int verboseFlag, freeHardLinkInfo(&tbInfo.hlInfoHead); if (errorFlag) - bb_error_msg("Error exit delayed from previous errors"); - - if (gzipPid && waitpid(gzipPid, NULL, 0)==-1) - bb_error_msg("Couldnt wait"); - - return !errorFlag; + bb_error_msg("error exit delayed from previous errors"); + + if (gzipPid) { + int status; + if (waitpid(gzipPid, &status, 0) == -1) + bb_perror_msg("waitpid"); + else if (!WIFEXITED(status) || WEXITSTATUS(status)) + /* gzip was killed or has exited with nonzero! */ + errorFlag = TRUE; + } + return errorFlag; } #else int writeTarFile(const int tar_fd, const int verboseFlag, const unsigned long dereferenceFlag, const llist_t *include, const llist_t *exclude, const int gzip); -#endif /* tar_create */ +#endif /* FEATURE_TAR_CREATE */ -#ifdef CONFIG_FEATURE_TAR_FROM +#if ENABLE_FEATURE_TAR_FROM static llist_t *append_file_list_to_list(llist_t *list) { FILE *src_stream; @@ -523,10 +620,11 @@ static llist_t *append_file_list_to_list(llist_t *list) tmp = cur; cur = cur->link; free(tmp); - while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { - char *filename_ptr = last_char_is(line, '/'); - if (filename_ptr > line) - *filename_ptr = '\0'; + while ((line = xmalloc_getline(src_stream)) != NULL) { + /* kill trailing '/' unless the string is just "/" */ + char *cp = last_char_is(line, '/'); + if (cp > line) + *cp = '\0'; llist_add_to(&newlist, line); } fclose(src_stream); @@ -534,19 +632,19 @@ static llist_t *append_file_list_to_list(llist_t *list) return newlist; } #else -#define append_file_list_to_list(x) 0 +#define append_file_list_to_list(x) 0 #endif -#ifdef CONFIG_FEATURE_TAR_COMPRESS +#if ENABLE_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; + /* Can't lseek over pipes */ + archive_handle->seek = seek_by_read; /* do the decompression, and cleanup */ - if (xread_char(archive_handle->src_fd) != 0x1f || - xread_char(archive_handle->src_fd) != 0x9d) - { + if (xread_char(archive_handle->src_fd) != 0x1f + || xread_char(archive_handle->src_fd) != 0x9d + ) { bb_error_msg_and_die("invalid magic"); } @@ -556,214 +654,203 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) /* nothing */; /* Can only do one file at a time */ - return(EXIT_FAILURE); + return EXIT_FAILURE; } #else -#define get_header_tar_Z 0 +#define get_header_tar_Z NULL #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) - -#define TAR_OPT_AFTER_START 8 - -#define CTX_CREATE (1 << (TAR_OPT_AFTER_START)) -#define TAR_OPT_DEREFERENCE (1 << (TAR_OPT_AFTER_START + 1)) -#ifdef CONFIG_FEATURE_TAR_CREATE -# define TAR_OPT_STR_CREATE "ch" -# define TAR_OPT_AFTER_CREATE TAR_OPT_AFTER_START + 2 -#else -# define TAR_OPT_STR_CREATE "" -# define TAR_OPT_AFTER_CREATE TAR_OPT_AFTER_START -#endif +#ifdef CHECK_FOR_CHILD_EXITCODE +/* Looks like it isn't needed - tar detects malformed (truncated) + * archive if e.g. bunzip2 fails */ +static int child_error; -#define TAR_OPT_BZIP2 (1 << (TAR_OPT_AFTER_CREATE)) -#ifdef CONFIG_FEATURE_TAR_BZIP2 -# define TAR_OPT_STR_BZIP2 "j" -# define TAR_OPT_AFTER_BZIP2 TAR_OPT_AFTER_CREATE + 1 -#else -# define TAR_OPT_STR_BZIP2 "" -# define TAR_OPT_AFTER_BZIP2 TAR_OPT_AFTER_CREATE -#endif - -#define TAR_OPT_LZMA (1 << (TAR_OPT_AFTER_BZIP2)) -#ifdef CONFIG_FEATURE_TAR_LZMA -# define TAR_OPT_STR_LZMA "a" -# define TAR_OPT_AFTER_LZMA TAR_OPT_AFTER_BZIP2 + 1 -#else -# define TAR_OPT_STR_LZMA "" -# define TAR_OPT_AFTER_LZMA TAR_OPT_AFTER_BZIP2 -#endif - -#define TAR_OPT_INCLUDE_FROM (1 << (TAR_OPT_AFTER_LZMA)) -#define TAR_OPT_EXCLUDE_FROM (1 << (TAR_OPT_AFTER_LZMA + 1)) -#ifdef CONFIG_FEATURE_TAR_FROM -# define TAR_OPT_STR_FROM "T:X:" -# define TAR_OPT_AFTER_FROM TAR_OPT_AFTER_LZMA + 2 -#else -# define TAR_OPT_STR_FROM "" -# define TAR_OPT_AFTER_FROM TAR_OPT_AFTER_LZMA -#endif - -#define TAR_OPT_GZIP (1 << (TAR_OPT_AFTER_FROM)) -#ifdef CONFIG_FEATURE_TAR_GZIP -# define TAR_OPT_STR_GZIP "z" -# define TAR_OPT_AFTER_GZIP TAR_OPT_AFTER_FROM + 1 -#else -# define TAR_OPT_STR_GZIP "" -# define TAR_OPT_AFTER_GZIP TAR_OPT_AFTER_FROM -#endif - -#define TAR_OPT_UNCOMPRESS (1 << (TAR_OPT_AFTER_GZIP)) -#ifdef CONFIG_FEATURE_TAR_COMPRESS -# define TAR_OPT_STR_COMPRESS "Z" -# define TAR_OPT_AFTER_COMPRESS TAR_OPT_AFTER_GZIP + 1 -#else -# define TAR_OPT_STR_COMPRESS "" -# define TAR_OPT_AFTER_COMPRESS TAR_OPT_AFTER_GZIP +static void handle_SIGCHLD(int status) +{ + /* Actually, 'status' is a signo. We reuse it for other needs */ + + /* Wait for any child without blocking */ + if (waitpid(-1, &status, WNOHANG) < 0) + /* wait failed?! I'm confused... */ + return; + + if (WIFEXITED(status) && WEXITSTATUS(status)==0) + /* child exited with 0 */ + return; + /* Cannot happen? + if (!WIFSIGNALED(status) && !WIFEXITED(status)) return; */ + child_error = 1; +} #endif -#define TAR_OPT_NOPRESERVE_OWN (1 << (TAR_OPT_AFTER_COMPRESS)) -#define TAR_OPT_NOPRESERVE_PERM (1 << (TAR_OPT_AFTER_COMPRESS + 1)) -#define TAR_OPT_STR_NOPRESERVE "\203\213" -#define TAR_OPT_AFTER_NOPRESERVE TAR_OPT_AFTER_COMPRESS + 2 - -static const char tar_options[]="txC:f:Opvk" \ - TAR_OPT_STR_CREATE \ - TAR_OPT_STR_BZIP2 \ - TAR_OPT_STR_LZMA \ - TAR_OPT_STR_FROM \ - TAR_OPT_STR_GZIP \ - TAR_OPT_STR_COMPRESS \ - TAR_OPT_STR_NOPRESERVE; - -#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS +enum { + OPTBIT_KEEP_OLD = 7, + USE_FEATURE_TAR_CREATE( OPTBIT_CREATE ,) + USE_FEATURE_TAR_CREATE( OPTBIT_DEREFERENCE ,) + USE_FEATURE_TAR_BZIP2( OPTBIT_BZIP2 ,) + USE_FEATURE_TAR_LZMA( OPTBIT_LZMA ,) + USE_FEATURE_TAR_FROM( OPTBIT_INCLUDE_FROM,) + USE_FEATURE_TAR_FROM( OPTBIT_EXCLUDE_FROM,) + USE_FEATURE_TAR_GZIP( OPTBIT_GZIP ,) + USE_FEATURE_TAR_COMPRESS(OPTBIT_COMPRESS ,) + OPTBIT_NOPRESERVE_OWN, + OPTBIT_NOPRESERVE_PERM, + OPT_TEST = 1 << 0, // t + OPT_EXTRACT = 1 << 1, // x + OPT_BASEDIR = 1 << 2, // C + OPT_TARNAME = 1 << 3, // f + OPT_2STDOUT = 1 << 4, // O + OPT_P = 1 << 5, // p + OPT_VERBOSE = 1 << 6, // v + OPT_KEEP_OLD = 1 << 7, // k + OPT_CREATE = USE_FEATURE_TAR_CREATE( (1<flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; + tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS + | ARCHIVE_PRESERVE_DATE + | ARCHIVE_EXTRACT_UNCONDITIONAL; /* Prepend '-' to the first argument if required */ - bb_opt_complementally = ENABLE_FEATURE_TAR_CREATE ? - "--:X::T::\n::c:t:x:?:c--tx:t--cx:x--ct" : - "--:X::T::\n::t:x:?:t--x:x--t"; - if (ENABLE_FEATURE_TAR_LONG_OPTIONS) - bb_applet_long_options = tar_long_options; - opt = bb_getopt_ulflags(argc, argv, tar_options, - &base_dir, /* Change to dir */ - &tar_filename /* archive filename */ -#ifdef CONFIG_FEATURE_TAR_FROM - , &(tar_handle->accept), - &(tar_handle->reject), - &excludes + opt_complementary = "--:" // first arg is options + "tt:vv:" // count -t,-v + "?:" // bail out with usage instead of error return + "X::T::" // cumulative lists +#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM + "\xff::" // cumulative lists for --exclude #endif - ); + USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd + USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive + SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive +#if ENABLE_FEATURE_TAR_LONG_OPTIONS + applet_long_options = tar_long_options; +#endif + opt = getopt32(argc, argv, + "txC:f:Opvk" + USE_FEATURE_TAR_CREATE( "ch" ) + USE_FEATURE_TAR_BZIP2( "j" ) + USE_FEATURE_TAR_LZMA( "a" ) + USE_FEATURE_TAR_FROM( "T:X:") + USE_FEATURE_TAR_GZIP( "z" ) + USE_FEATURE_TAR_COMPRESS("Z" ) + , &base_dir // -C dir + , &tar_filename // -f filename + USE_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T + USE_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X +#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM + , &excludes // --exclude +#endif + , &verboseFlag // combined count for -t and -v + , &verboseFlag // combined count for -t and -v + ); - if (opt & 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((opt & CTX_EXTRACT) && tar_handle->action_data != data_extract_to_stdout) + if (verboseFlag) tar_handle->action_header = header_verbose_list; + if (verboseFlag == 1) tar_handle->action_header = header_list; + + if (opt & OPT_EXTRACT) tar_handle->action_data = data_extract_all; - if (opt & TAR_OPT_2STDOUT) + if (opt & OPT_2STDOUT) 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) + if (opt & OPT_KEEP_OLD) tar_handle->flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL; - if (opt & TAR_OPT_NOPRESERVE_OWN) + if (opt & OPT_NOPRESERVE_OWN) tar_handle->flags |= ARCHIVE_NOPRESERVE_OWN; - if (opt & TAR_OPT_NOPRESERVE_PERM) + if (opt & OPT_NOPRESERVE_PERM) tar_handle->flags |= ARCHIVE_NOPRESERVE_PERM; - if (ENABLE_FEATURE_TAR_GZIP && (opt & TAR_OPT_GZIP)) + if (opt & OPT_GZIP) get_header_ptr = get_header_tar_gz; - if (ENABLE_FEATURE_TAR_BZIP2 && (opt & TAR_OPT_BZIP2)) + if (opt & OPT_BZIP2) get_header_ptr = get_header_tar_bz2; - if (ENABLE_FEATURE_TAR_LZMA && (opt & TAR_OPT_LZMA)) + if (opt & OPT_LZMA) get_header_ptr = get_header_tar_lzma; - if (ENABLE_FEATURE_TAR_COMPRESS && (opt & TAR_OPT_UNCOMPRESS)) + if (opt & OPT_COMPRESS) get_header_ptr = get_header_tar_Z; - if (ENABLE_FEATURE_TAR_FROM) { - tar_handle->reject = append_file_list_to_list(tar_handle->reject); - /* Append excludes to reject */ - while (excludes) { - llist_t *temp = excludes->link; - excludes->link = tar_handle->reject; - tar_handle->reject = excludes; - excludes = temp; - } - tar_handle->accept = append_file_list_to_list(tar_handle->accept); +#if ENABLE_FEATURE_TAR_FROM + tar_handle->reject = append_file_list_to_list(tar_handle->reject); +#if ENABLE_FEATURE_TAR_LONG_OPTIONS + /* Append excludes to reject */ + while (excludes) { + llist_t *next = excludes->link; + excludes->link = tar_handle->reject; + tar_handle->reject = excludes; + excludes = next; } +#endif + tar_handle->accept = append_file_list_to_list(tar_handle->accept); +#endif /* Check if we are reading from stdin */ if (argv[optind] && *argv[optind] == '-') { @@ -774,15 +861,15 @@ int tar_main(int argc, char **argv) /* 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 > argv[optind]) - *filename_ptr = '\0'; - - llist_add_to(&(tar_handle->accept), argv[optind]); + /* kill trailing '/' unless the string is just "/" */ + char *cp = last_char_is(argv[optind], '/'); + if (cp > argv[optind]) + *cp = '\0'; + llist_add_to_end(&tar_handle->accept, argv[optind]); optind++; } - if ((tar_handle->accept) || (tar_handle->reject)) + if (tar_handle->accept || tar_handle->reject) tar_handle->filter = filter_accept_reject_list; /* Open the tar file */ @@ -790,65 +877,64 @@ int tar_main(int argc, char **argv) FILE *tar_stream; int flags; - if (ENABLE_FEATURE_TAR_CREATE && (opt & CTX_CREATE)) { + if (opt & OPT_CREATE) { /* Make sure there is at least one file to tar up. */ if (tar_handle->accept == NULL) bb_error_msg_and_die("empty archive"); tar_stream = stdout; - flags = O_WRONLY | O_CREAT | O_EXCL; - unlink(tar_filename); + /* Mimicking GNU tar 1.15.1: */ + flags = O_WRONLY|O_CREAT|O_TRUNC; + /* was doing unlink; open(O_WRONLY|O_CREAT|O_EXCL); why? */ } else { tar_stream = stdin; flags = O_RDONLY; } - if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) { + if (LONE_DASH(tar_filename)) { tar_handle->src_fd = fileno(tar_stream); - tar_handle->seek = seek_by_char; + tar_handle->seek = seek_by_read; } else { - tar_handle->src_fd = xopen3(tar_filename, flags, 0666); + tar_handle->src_fd = xopen(tar_filename, flags); } } if (base_dir) xchdir(base_dir); +#ifdef CHECK_FOR_CHILD_EXITCODE + /* We need to know whether child (gzip/bzip/etc) exits abnormally */ + signal(SIGCHLD, handle_SIGCHLD); +#endif + /* create an archive */ - if (ENABLE_FEATURE_TAR_CREATE && (opt & CTX_CREATE)) { - int verboseFlag = FALSE; + if (opt & OPT_CREATE) { int zipMode = 0; - if (ENABLE_FEATURE_TAR_GZIP && get_header_ptr == get_header_tar_gz) zipMode = 1; if (ENABLE_FEATURE_TAR_BZIP2 && get_header_ptr == get_header_tar_bz2) zipMode = 2; - - 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_DEREFERENCE, + /* NB: writeTarFile() closes tar_handle->src_fd */ + return writeTarFile(tar_handle->src_fd, verboseFlag, opt & OPT_DEREFERENCE, tar_handle->accept, - tar_handle->reject, zipMode); - } else { - while (get_header_ptr(tar_handle) == EXIT_SUCCESS) - /* nothing */; - - /* 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; - } + tar_handle->reject, zipMode); } - if (ENABLE_FEATURE_CLEAN_UP && tar_handle->src_fd != STDIN_FILENO) + while (get_header_ptr(tar_handle) == EXIT_SUCCESS) + /* nothing */; + + /* 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 */) close(tar_handle->src_fd); - return(EXIT_SUCCESS); + return EXIT_SUCCESS; }