aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen <andersen@codepoet.org>2000-03-25 23:09:29 +0000
committerErik Andersen <andersen@codepoet.org>2000-03-25 23:09:29 +0000
commitdeea048becd9d2d013537755ffad9bb615efeadc (patch)
tree0890278e607ddf27b42f2e055bc80dfcd496cd59
parent1ad302ac903695ef4ba748d3880222c05eeaafef (diff)
downloadbusybox-w32-deea048becd9d2d013537755ffad9bb615efeadc.tar.gz
busybox-w32-deea048becd9d2d013537755ffad9bb615efeadc.tar.bz2
busybox-w32-deea048becd9d2d013537755ffad9bb615efeadc.zip
Latest and greatest
-Erik
Diffstat
-rw-r--r--archival/tar.c10
-rw-r--r--tar.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/archival/tar.c b/archival/tar.c
index f7b789f7c..477487a50 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -286,7 +286,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
286 } 286 }
287 if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) { 287 if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) {
288 /* Tarball seems to have a problem */ 288 /* Tarball seems to have a problem */
289 errorMsg("Error reading tarfile: %s", strerror(errno)); 289 errorMsg("tar: Unexpected EOF in archive\n");
290 return; 290 return;
291 } 291 }
292 if ( readSize < writeSize ) 292 if ( readSize < writeSize )
@@ -360,7 +360,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
360 return; 360 return;
361 361
362 if (link(header->linkname, header->name) < 0) { 362 if (link(header->linkname, header->name) < 0) {
363 errorMsg("Error creating hard link '%s': %s", header->linkname, strerror(errno)); 363 errorMsg("Error creating hard link '%s': %s\n", header->linkname, strerror(errno));
364 return; 364 return;
365 } 365 }
366 366
@@ -376,7 +376,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
376 376
377#ifdef S_ISLNK 377#ifdef S_ISLNK
378 if (symlink(header->linkname, header->name) < 0) { 378 if (symlink(header->linkname, header->name) < 0) {
379 errorMsg("Error creating symlink '%s': %s", header->linkname, strerror(errno)); 379 errorMsg("Error creating symlink '%s': %s\n", header->linkname, strerror(errno));
380 return; 380 return;
381 } 381 }
382 /* Try to change ownership of the symlink. 382 /* Try to change ownership of the symlink.
@@ -485,7 +485,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
485 else 485 else
486 tarFd = open(tarName, O_RDONLY); 486 tarFd = open(tarName, O_RDONLY);
487 if (tarFd < 0) { 487 if (tarFd < 0) {
488 errorMsg( "Error opening '%s': %s", tarName, strerror(errno)); 488 errorMsg( "Error opening '%s': %s\n", tarName, strerror(errno));
489 return ( FALSE); 489 return ( FALSE);
490 } 490 }
491 491
@@ -600,7 +600,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
600 close(tarFd); 600 close(tarFd);
601 if (status > 0) { 601 if (status > 0) {
602 /* Bummer - we read a partial header */ 602 /* Bummer - we read a partial header */
603 errorMsg( "Error reading '%s': %s", tarName, strerror(errno)); 603 errorMsg( "Error reading '%s': %s\n", tarName, strerror(errno));
604 return ( FALSE); 604 return ( FALSE);
605 } 605 }
606 else 606 else
diff --git a/tar.c b/tar.c
index f7b789f7c..477487a50 100644
--- a/tar.c
+++ b/tar.c
@@ -286,7 +286,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
286 } 286 }
287 if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) { 287 if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) {
288 /* Tarball seems to have a problem */ 288 /* Tarball seems to have a problem */
289 errorMsg("Error reading tarfile: %s", strerror(errno)); 289 errorMsg("tar: Unexpected EOF in archive\n");
290 return; 290 return;
291 } 291 }
292 if ( readSize < writeSize ) 292 if ( readSize < writeSize )
@@ -360,7 +360,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
360 return; 360 return;
361 361
362 if (link(header->linkname, header->name) < 0) { 362 if (link(header->linkname, header->name) < 0) {
363 errorMsg("Error creating hard link '%s': %s", header->linkname, strerror(errno)); 363 errorMsg("Error creating hard link '%s': %s\n", header->linkname, strerror(errno));
364 return; 364 return;
365 } 365 }
366 366
@@ -376,7 +376,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
376 376
377#ifdef S_ISLNK 377#ifdef S_ISLNK
378 if (symlink(header->linkname, header->name) < 0) { 378 if (symlink(header->linkname, header->name) < 0) {
379 errorMsg("Error creating symlink '%s': %s", header->linkname, strerror(errno)); 379 errorMsg("Error creating symlink '%s': %s\n", header->linkname, strerror(errno));
380 return; 380 return;
381 } 381 }
382 /* Try to change ownership of the symlink. 382 /* Try to change ownership of the symlink.
@@ -485,7 +485,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
485 else 485 else
486 tarFd = open(tarName, O_RDONLY); 486 tarFd = open(tarName, O_RDONLY);
487 if (tarFd < 0) { 487 if (tarFd < 0) {
488 errorMsg( "Error opening '%s': %s", tarName, strerror(errno)); 488 errorMsg( "Error opening '%s': %s\n", tarName, strerror(errno));
489 return ( FALSE); 489 return ( FALSE);
490 } 490 }
491 491
@@ -600,7 +600,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
600 close(tarFd); 600 close(tarFd);
601 if (status > 0) { 601 if (status > 0) {
602 /* Bummer - we read a partial header */ 602 /* Bummer - we read a partial header */
603 errorMsg( "Error reading '%s': %s", tarName, strerror(errno)); 603 errorMsg( "Error reading '%s': %s\n", tarName, strerror(errno));
604 return ( FALSE); 604 return ( FALSE);
605 } 605 }
606 else 606 else
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 05:10:27 +0000