svn commit: trunk/busybox/archival
landley at busybox.net
landley at busybox.net
Mon Jan 9 03:07:45 UTC 2006
Author: landley
Date: 2006-01-08 19:07:44 -0800 (Sun, 08 Jan 2006)
New Revision: 13189
Log:
Bug 547: writing out the tar file header before we confirm we can actually
open and read from the file isn't something we can recover from after the
fact. Resequence things to check first, write second.
Modified:
trunk/busybox/archival/tar.c
Changeset:
Modified: trunk/busybox/archival/tar.c
===================================================================
--- trunk/busybox/archival/tar.c 2006-01-09 03:03:54 UTC (rev 13188)
+++ trunk/busybox/archival/tar.c 2006-01-09 03:07:44 UTC (rev 13189)
@@ -331,6 +331,7 @@
{
struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
const char *header_name;
+ int inputFileFd = -1;
/*
** Check to see if we are dealing with a hard link.
@@ -385,30 +386,32 @@
return SKIP;
}
- if (writeTarHeader(tbInfo, header_name, fileName, statbuf) == FALSE) {
- return (FALSE);
- }
+ /* Is this a regular file? */
+ if ((tbInfo->hlInfo == NULL) && (S_ISREG(statbuf->st_mode))) {
- /* Now, if the file is a regular file, copy it out to the tarball */
- if ((tbInfo->hlInfo == NULL)
- && (S_ISREG(statbuf->st_mode))) {
- int inputFileFd;
- ssize_t readSize = 0;
-
/* 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);
return (FALSE);
}
+ }
+ /* Add an entry to the tarball */
+ if (writeTarHeader(tbInfo, header_name, fileName, statbuf) == FALSE) {
+ return (FALSE);
+ }
+
+ /* If it was a regular file, write out the body */
+ if (inputFileFd >= 0 ) {
+ ssize_t readSize = 0;
+
/* write the file to the archive */
readSize = bb_copyfd_eof(inputFileFd, tbInfo->tarFd);
+ close(inputFileFd);
/* Pad the file up to the tar block size */
for (; (readSize % TAR_BLOCK_SIZE) != 0; readSize++)
write(tbInfo->tarFd, "\0", 1);
-
- close(inputFileFd);
}
return (TRUE);
More information about the busybox-cvs
mailing list