From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 9 Jun 2000 20:51:50 +0000 (-0000)
Subject: * Fixed a small bug that could cause tar to emit warning messages
X-Git-Tag: 0_45~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c6a970eb26edf7e77e7c173d478b94100969fc4;p=oweals%2Fbusybox.git

* Fixed a small bug that could cause tar to emit warning messages
    and not extract the first file in a directory in some cases
    of nested directories.  Thanks to Kevin Traas <kevin@netmaster.com>
    for helping track this one down.
 -Erik
---

diff --git a/Changelog b/Changelog
index 98d145f0b..30f28209d 100644
--- a/Changelog
+++ b/Changelog
@@ -67,6 +67,10 @@
 	    Pavel Roskin
 	* Syslogd will not go to background if "-n" is given. Better help
 	    and argument checking -- Pavel Roskin
+	* Fixed a small bug that could cause tar to emit warning messages
+	    and not extract the first file in a directory in some cases
+	    of nested directories.  Thanks to Kevin Traas <kevin@netmaster.com>
+	    for helping track this one down.
 	* More doc updates
 
 
diff --git a/archival/tar.c b/archival/tar.c
index 7d440f451..86f996576 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -300,11 +300,14 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
 
 	/* Open the file to be written, if a file is supposed to be written */
 	if (extractFlag==TRUE && tostdoutFlag==FALSE) {
-		if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, header->mode & ~S_IFMT)) < 0)
-			errorMsg(io_error, header->name, strerror(errno)); 
 		/* Create the path to the file, just in case it isn't there...
 		 * This should not screw up path permissions or anything. */
 		createPath(header->name, 0777);
+		if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, 
+						header->mode & ~S_IFMT)) < 0) {
+			errorMsg(io_error, header->name, strerror(errno)); 
+			return( FALSE);
+		}
 	}
 
 	/* Write out the file, if we are supposed to be doing that */
diff --git a/tar.c b/tar.c
index 7d440f451..86f996576 100644
--- a/tar.c
+++ b/tar.c
@@ -300,11 +300,14 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
 
 	/* Open the file to be written, if a file is supposed to be written */
 	if (extractFlag==TRUE && tostdoutFlag==FALSE) {
-		if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, header->mode & ~S_IFMT)) < 0)
-			errorMsg(io_error, header->name, strerror(errno)); 
 		/* Create the path to the file, just in case it isn't there...
 		 * This should not screw up path permissions or anything. */
 		createPath(header->name, 0777);
+		if ((outFd=open(header->name, O_CREAT|O_TRUNC|O_WRONLY, 
+						header->mode & ~S_IFMT)) < 0) {
+			errorMsg(io_error, header->name, strerror(errno)); 
+			return( FALSE);
+		}
 	}
 
 	/* Write out the file, if we are supposed to be doing that */