#include <stdlib.h>
#include <unistd.h>
#include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#define bb_need_name_longer_than_foo
-#include "messages.c"
-
-#ifdef BB_FEATURE_TAR_GZIP
-extern int unzip(int in, int out);
-#endif
/* Tar file constants */
#ifndef MAJOR
typedef struct TarInfo TarInfo;
/* Local procedures to restore files from a tar file. */
-extern int readTarFile(int tarFd, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList);
char** excludeList);
#endif
-#ifdef BB_FEATURE_TAR_GZIP
-/* Signal handler for when child gzip process dies... */
-static void child_died()
-{
- fflush(stdout);
- fflush(stderr);
- exit(EXIT_FAILURE);
-}
-
-extern int tar_unzip_init(int tarFd)
-{
- int child_pid;
- static int unzip_pipe[2];
- /* Cope if child dies... Otherwise we block forever in read()... */
- signal(SIGCHLD, child_died);
-
- if (pipe(unzip_pipe)!=0)
- error_msg_and_die("pipe error");
-
- if ( (child_pid = fork()) == -1)
- error_msg_and_die("fork failure");
-
- if (child_pid==0) {
- /* child process */
- close(unzip_pipe[0]);
-// gunzip_init();
- unzip(tarFd, unzip_pipe[1]);
- exit(EXIT_SUCCESS);
- }
- else {
- /* return fd of uncompressed data to parent process */
- close(unzip_pipe[1]);
- return(unzip_pipe[0]);
- }
-}
-#endif
-
#if defined BB_FEATURE_TAR_EXCLUDE
static struct option longopts[] = {
{ "exclude", 1, NULL, 'e' },
char file[256];
#endif
#if defined BB_FEATURE_TAR_GZIP
+ FILE *comp_file = NULL;
int unzipFlag = FALSE;
#endif
int listFlag = FALSE;
int tostdoutFlag = FALSE;
int status = FALSE;
int opt;
+ pid_t pid;
if (argc <= 1)
show_usage();
#ifdef BB_FEATURE_TAR_GZIP
/* unzip tarFd in a seperate process */
- if (unzipFlag == TRUE)
- tarFd = tar_unzip_init(tarFd);
+ if (unzipFlag == TRUE) {
+ comp_file = fdopen(tarFd, "r");
+ if ((tarFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) {
+ error_msg_and_die("Couldnt unzip file");
+ }
+ }
#endif
status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag,
verboseFlag, extractList, excludeList);
+ close(tarFd);
+#ifdef BB_FEATURE_TAR_GZIP
+ if (unzipFlag == TRUE) {
+ gz_close(pid);
+ fclose(comp_file);
+ }
+#endif
}
if (status == TRUE)
return( TRUE);
}
-/* Read an octal value in a field of the specified width, with optional
- * spaces on both sides of the number and with an optional null character
- * at the end. Returns -1 on an illegal format. */
-static long getOctal(const char *cp, int size)
-{
- long val = 0;
-
- for(;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size == 0) || !is_octal(*cp))
- return -1;
- for(; (size > 0) && is_octal(*cp); size--) {
- val = val * 8 + *cp++ - '0';
- }
- for (;(size > 0) && (*cp == ' '); cp++, size--);
- if ((size > 0) && *cp)
- return -1;
- return val;
-}
-
-
/* Parse the tar header and fill in the nice struct with the details */
static int
readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
}
}
- header->mode = getOctal(rawHeader->mode, sizeof(rawHeader->mode));
- header->uid = getOctal(rawHeader->uid, sizeof(rawHeader->uid));
- header->gid = getOctal(rawHeader->gid, sizeof(rawHeader->gid));
- header->size = getOctal(rawHeader->size, sizeof(rawHeader->size));
- header->mtime = getOctal(rawHeader->mtime, sizeof(rawHeader->mtime));
- chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum));
+ header->mode = strtol(rawHeader->mode, NULL, 8);
+ header->uid = strtol(rawHeader->uid, NULL, 8);
+ header->gid = strtol(rawHeader->gid, NULL, 8);
+ header->size = strtol(rawHeader->size, NULL, 8);
+ header->mtime = strtol(rawHeader->mtime, NULL, 8);
+ chksum = strtol(rawHeader->chksum, NULL, 8);
header->type = rawHeader->typeflag;
header->linkname = rawHeader->linkname;
- header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor));
- header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor));
+ header->devmajor = strtol(rawHeader->devmajor, NULL, 8);
+ header->devminor = strtol(rawHeader->devminor, NULL, 8);
/* Check the checksum */
for (i = sizeof(*rawHeader); i-- != 0;) {
* Read a tar file and extract or list the specified files within it.
* If the list is empty than all files are extracted or listed.
*/
-extern int readTarFile(int tarFd, int extractFlag, int listFlag,
+static int readTarFile(int tarFd, int extractFlag, int listFlag,
int tostdoutFlag, int verboseFlag, char** extractList,
char** excludeList)
{
}
}
if ( *(header.name) == '\0' )
- goto endgame;
+ continue;
header.tarFd = tarFd;
/* Skip funky extra GNU headers that precede long files */
case REGTYPE0:
/* If the name ends in a '/' then assume it is
* supposed to be a directory, and fall through */
- if (header.name[strlen(header.name)-1] != '/') {
+ if (!last_char_is(header.name,'/')) {
if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE)
errorFlag=TRUE;
break;
header.typeflag = LNKTYPE;
strncpy(header.linkname, tbInfo->hlInfo->name, sizeof(header.linkname));
} else if (S_ISLNK(statbuf->st_mode)) {
- int link_size=0;
- char buffer[BUFSIZ];
+ char *lpath = xreadlink(real_name);
header.typeflag = SYMTYPE;
- link_size = readlink(real_name, buffer, sizeof(buffer) - 1);
- if ( link_size < 0) {
- perror_msg("Error reading symlink '%s'", header.name);
- return ( FALSE);
- }
- buffer[link_size] = '\0';
- strncpy(header.linkname, buffer, sizeof(header.linkname));
+ 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));
projects / oweals / busybox.git / blobdiff