emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed a small bug that could cause tar to emit warning messages

Browse Source 
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
This commit is contained in:
Eric Andersen 2000-06-09 20:51:50 +00:00
parent b3d235f63b
commit 0c6a970eb2
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog
View File

@ -67,6 +67,10 @@
Pavel Roskin Pavel Roskin
* Syslogd will not go to background if "-n" is given. Better help * Syslogd will not go to background if "-n" is given. Better help
and argument checking -- Pavel Roskin 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 * More doc updates

7
archival/tar.c
View File

@ -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 */ /* Open the file to be written, if a file is supposed to be written */
if (extractFlag==TRUE && tostdoutFlag==FALSE) { 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... /* Create the path to the file, just in case it isn't there...
* This should not screw up path permissions or anything. */ * This should not screw up path permissions or anything. */
createPath(header->name, 0777); 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 */ /* Write out the file, if we are supposed to be doing that */

7
tar.c
View File

@ -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 */ /* Open the file to be written, if a file is supposed to be written */
if (extractFlag==TRUE && tostdoutFlag==FALSE) { 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... /* Create the path to the file, just in case it isn't there...
* This should not screw up path permissions or anything. */ * This should not screw up path permissions or anything. */
createPath(header->name, 0777); 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 */ /* Write out the file, if we are supposed to be doing that */