* Modified for busybox by Erik Andersen <andersee@debian.org>
* Adjusted to grok stdin/stdout options.
*
+ * Modified to handle device special files by Matt Porter
+ * <porter@debian.org>
+ *
* 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
#include <fcntl.h>
#include <signal.h>
#include <time.h>
+#include <sys/types.h>
+#include <sys/sysmacros.h>
static const char tar_usage[] =
- "tar -[cxtvOf] [tarFileName] [FILE] ...\n"
- "Create, extract, or list files from a tar file\n\n"
- "\tc=create, x=extract, t=list contents, v=verbose,\n"
- "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
+"tar -[cxtvOf] [tarFileName] [FILE] ...\n\n"
+"Create, extract, or list files from a tar file\n\n"
+"Options:\n"
+"\tc=create, x=extract, t=list contents, v=verbose,\n"
+"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
static int verboseFlag;
static int tostdoutFlag;
-static int inHeader;
+static int inHeader; // <- check me
static int badHeader;
static int errorFlag;
static int skipFileFlag;
/*
* Parse the options.
*/
- options = *argv++;
- argc--;
-
if (**argv == '-') {
+ options = (*argv++) + 1;
+ argc--;
for (; *options; options++) {
switch (*options) {
case 'f':
break;
case '-':
+ usage( tar_usage);
break;
default:
- fprintf (stderr, "Unknown tar flag '%c'\n", *options);
+ fprintf (stderr, "Unknown tar flag '%c'\n"
+ "Try `tar --help' for more information\n",
+ *options);
exit (FALSE);
}
/*
* Validate the options.
*/
- if (extractFlag + listFlag + createFlag != 1) {
+ if (extractFlag + listFlag + createFlag != (TRUE+FALSE+FALSE)) {
fprintf (stderr,
"Exactly one of 'c', 'x' or 't' must be specified\n");
* Do the correct type of action supplying the rest of the
* command line arguments as the list of files to process.
*/
- if (createFlag)
+ if (createFlag==TRUE)
writeTarFile (argc, argv);
else
readTarFile (argc, argv);
- if (errorFlag)
+ if (errorFlag==TRUE)
fprintf (stderr, "\n");
- exit (errorFlag);
+ exit (!errorFlag);
}
* Open the tar file for reading.
*/
if ((tarName == NULL) || !strcmp (tarName, "-")) {
- tarFd = STDIN;
+ tarFd = fileno(stdin);
} else
tarFd = open (tarName, O_RDONLY);
* Read blocks from the file until an end of file header block
* has been seen. (A real end of file from a read is an error.)
*/
- while (!eofFlag) {
+ while (eofFlag==FALSE) {
/*
* Read the next block of data if necessary.
* This will be a large block if possible, which we will
/*
* If we are expecting a header block then examine it.
*/
- if (inHeader) {
+ if (inHeader==TRUE) {
readHeader ((const TarHeader *) cp, fileCount, fileTable);
cp += TAR_BLOCK_SIZE;
int uid;
int gid;
int checkSum;
+ unsigned int major;
+ unsigned int minor;
long size;
time_t mtime;
const char *name;
int cc;
int hardLink;
int softLink;
+ int devFileFlag;
/*
* If the block is completely empty, then this is the end of the
size = getOctal (hp->size, sizeof (hp->size));
mtime = getOctal (hp->mtime, sizeof (hp->mtime));
checkSum = getOctal (hp->checkSum, sizeof (hp->checkSum));
+ major = getOctal (hp->devMajor, sizeof (hp->devMajor));
+ minor = getOctal (hp->devMinor, sizeof (hp->devMinor));
if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) {
- if (!badHeader)
+ if (badHeader==FALSE)
fprintf (stderr, "Bad tar header, skipping\n");
badHeader = TRUE;
badHeader = FALSE;
skipFileFlag = FALSE;
+ devFileFlag = FALSE;
/*
* Check for the file modes.
(hp->typeFlag == TAR_TYPE_SOFT_LINK - '0'));
/*
- * Check for a directory or a regular file.
+ * Check for a directory.
*/
if (name[strlen (name) - 1] == '/')
mode |= S_IFDIR;
- else if ((mode & S_IFMT) == 0)
- mode |= S_IFREG;
/*
* Check for absolute paths in the file.
while (*name == '/')
name++;
- if (!warnedRoot) {
+ if (warnedRoot==FALSE) {
fprintf (stderr,
"Absolute path detected, removing leading slashes\n");
}
* See if we want this file to be restored.
* If not, then set up to skip it.
*/
- if (!wantFileName (name, fileCount, fileTable)) {
- if (!hardLink && !softLink && S_ISREG (mode)) {
- inHeader = (size == 0);
+ if (wantFileName (name, fileCount, fileTable) == FALSE) {
+ if ( !hardLink && !softLink && (S_ISREG (mode) || S_ISCHR (mode)
+ || S_ISBLK (mode) || S_ISSOCK(mode) || S_ISFIFO(mode) ) ) {
+ inHeader = (size == 0)? TRUE : FALSE;
dataCc = size;
}
* This file is to be handled.
* If we aren't extracting then just list information about the file.
*/
- if (!extractFlag) {
- if (verboseFlag) {
- printf ("%s %3d/%-d %9ld %s %s", modeString (mode),
- uid, gid, size, timeString (mtime), name);
- } else
- printf ("%s", name);
+ if (extractFlag==FALSE) {
+ if (verboseFlag==TRUE) {
+ printf ("%s %3d/%-d ", modeString (mode), uid, gid);
+ if( S_ISCHR (mode) || S_ISBLK (mode) )
+ printf ("%4d,%4d %s ", major,minor, timeString (mtime));
+ else
+ printf ("%9ld %s ", size, timeString (mtime));
+ }
+ printf ("%s", name);
if (hardLink)
printf (" (link to \"%s\")", hp->linkName);
else if (softLink)
printf (" (symlink to \"%s\")", hp->linkName);
- else if (S_ISREG (mode)) {
- inHeader = (size == 0);
+ else if (S_ISREG (mode) || S_ISCHR (mode) || S_ISBLK (mode) ||
+ S_ISSOCK(mode) || S_ISFIFO(mode) ) {
+ inHeader = (size == 0)? TRUE : FALSE;
dataCc = size;
}
/*
* We really want to extract the file.
*/
- if (verboseFlag)
+ if (verboseFlag==TRUE)
printf ("x %s\n", name);
if (hardLink) {
if (link (hp->linkName, name) < 0)
perror (name);
-
+ chmod(name, mode);
+ chown(name, uid, gid);
return;
}
#ifdef S_ISLNK
if (symlink (hp->linkName, name) < 0)
perror (name);
+ chmod(name, mode);
+ chown(name, uid, gid);
#else
fprintf (stderr, "Cannot create symbolic links\n");
#endif
return;
}
+ /* Set the umask for this process so it doesn't
+ * screw things up. */
+ umask(0);
+
/*
* If the file is a directory, then just create the path.
*/
if (S_ISDIR (mode)) {
createPath (name, mode);
+ chmod(name, mode);
+ chown(name, uid, gid);
return;
}
/*
* There is a file to write.
- * First create the path to it if necessary with a default permission.
+ * First create the path to it if necessary with default permissions.
*/
createPath (name, 0777);
- inHeader = (size == 0);
+ inHeader = (size == 0)? TRUE : FALSE;
dataCc = size;
/*
* Start the output file.
*/
if (tostdoutFlag == TRUE)
- outFd = STDOUT;
- else
- outFd = open (name, O_WRONLY | O_CREAT | O_TRUNC, mode);
+ outFd = fileno(stdout);
+ else {
+ if ( S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) ) {
+ devFileFlag = TRUE;
+ outFd = mknod (name, mode, makedev(major, minor) );
+ }
+ else if (S_ISFIFO(mode) ) {
+ devFileFlag = TRUE;
+ outFd = mkfifo(name, mode);
+ } else {
+ outFd = open (name, O_WRONLY | O_CREAT | O_TRUNC, mode);
+ }
+ }
if (outFd < 0) {
perror (name);
skipFileFlag = TRUE;
return;
}
+ if (tostdoutFlag == FALSE) {
+ fchmod(outFd, mode);
+ fchown(outFd, uid, gid);
+ }
/*
* If the file is empty, then that's all we need to do.
*/
- if (size == 0 && tostdoutFlag == FALSE) {
+ if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) {
(void) close (outFd);
outFd = -1;
}
* If we aren't extracting files or this file is being
* skipped then do nothing more.
*/
- if (!extractFlag || skipFileFlag)
+ if (extractFlag==FALSE || skipFileFlag==TRUE)
return;
/*
*/
if ((tarName == NULL) || !strcmp (tarName, "-")) {
tostdoutFlag = TRUE;
- tarFd = STDOUT;
+ tarFd = fileno(stdout);
} else
tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666);
tarDev = statbuf.st_dev;
tarInode = statbuf.st_ino;
-
+
/*
* Append each file name into the archive file.
* Follow symbolic links for these top level file names.
*/
- while (!errorFlag && (fileCount-- > 0)) {
+ while (errorFlag==FALSE && (fileCount-- > 0)) {
saveFile (*fileTable++, FALSE);
}
int mode;
struct stat statbuf;
- if (verboseFlag)
+ if (verboseFlag==TRUE)
printf ("a %s\n", fileName);
/*
* Find out about the file.
*/
#ifdef S_ISLNK
- if (seeLinks)
+ if (seeLinks==TRUE)
status = lstat (fileName, &statbuf);
else
#endif
return;
}
-
if (S_ISREG (mode)) {
saveRegularFile (fileName, &statbuf);
return;
}
+
+ /* Some day add support for tarring these up... but not today. :) */
+// if (S_ISLNK(mode) || S_ISFIFO(mode) || S_ISBLK(mode) || S_ISCHR (mode) ) {
+// fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName);
+// }
/*
* The file is a strange type of file, ignore it.
*/
cc = 0;
- if (!sawEof) {
+ if (sawEof==FALSE) {
cc = fullRead (fileFd, data, dataCount);
if (cc < 0) {
* Read all of the directory entries and check them,
* except for the current and parent directory entries.
*/
- while (!errorFlag && ((entry = readdir (dir)) != NULL)) {
+ while (errorFlag==FALSE && ((entry = readdir (dir)) != NULL)) {
if ((strcmp (entry->d_name, ".") == 0) ||
(strcmp (entry->d_name, "..") == 0)) {
continue;
/*
* If we had a write error before, then do nothing more.
*/
- if (errorFlag)
+ if (errorFlag==TRUE)
return;
/*