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

Latest and greatest

Browse Source 
-Erik
This commit is contained in:
Erik Andersen 2000-03-25 23:09:29 +00:00
parent 1ad302ac90
commit deea048bec
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/tar.c
View File

@ -286,7 +286,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
} }
if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) { if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) {
/* Tarball seems to have a problem */ /* Tarball seems to have a problem */
errorMsg("Error reading tarfile: %s", strerror(errno)); errorMsg("tar: Unexpected EOF in archive\n");
return; return;
} }
if ( readSize < writeSize ) if ( readSize < writeSize )
@ -360,7 +360,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
return; return;
if (link(header->linkname, header->name) < 0) { if (link(header->linkname, header->name) < 0) {
errorMsg("Error creating hard link '%s': %s", header->linkname, strerror(errno)); errorMsg("Error creating hard link '%s': %s\n", header->linkname, strerror(errno));
return; return;
} }
@ -376,7 +376,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
#ifdef S_ISLNK #ifdef S_ISLNK
if (symlink(header->linkname, header->name) < 0) { if (symlink(header->linkname, header->name) < 0) {
errorMsg("Error creating symlink '%s': %s", header->linkname, strerror(errno)); errorMsg("Error creating symlink '%s': %s\n", header->linkname, strerror(errno));
return; return;
} }
/* Try to change ownership of the symlink. /* Try to change ownership of the symlink.
@ -485,7 +485,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
else else
tarFd = open(tarName, O_RDONLY); tarFd = open(tarName, O_RDONLY);
if (tarFd < 0) { if (tarFd < 0) {
errorMsg( "Error opening '%s': %s", tarName, strerror(errno)); errorMsg( "Error opening '%s': %s\n", tarName, strerror(errno));
return ( FALSE); return ( FALSE);
} }
@ -600,7 +600,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
close(tarFd); close(tarFd);
if (status > 0) { if (status > 0) {
/* Bummer - we read a partial header */ /* Bummer - we read a partial header */
errorMsg( "Error reading '%s': %s", tarName, strerror(errno)); errorMsg( "Error reading '%s': %s\n", tarName, strerror(errno));
return ( FALSE); return ( FALSE);
} }
else else

10
tar.c
View File

@ -286,7 +286,7 @@ tarExtractRegularFile(TarInfo *header, int extractFlag, int tostdoutFlag)
} }
if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) { if ( (readSize = fullRead(header->tarFd, buffer, readSize)) <= 0 ) {
/* Tarball seems to have a problem */ /* Tarball seems to have a problem */
errorMsg("Error reading tarfile: %s", strerror(errno)); errorMsg("tar: Unexpected EOF in archive\n");
return; return;
} }
if ( readSize < writeSize ) if ( readSize < writeSize )
@ -360,7 +360,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
return; return;
if (link(header->linkname, header->name) < 0) { if (link(header->linkname, header->name) < 0) {
errorMsg("Error creating hard link '%s': %s", header->linkname, strerror(errno)); errorMsg("Error creating hard link '%s': %s\n", header->linkname, strerror(errno));
return; return;
} }
@ -376,7 +376,7 @@ tarExtractSymLink(TarInfo *header, int extractFlag, int tostdoutFlag)
#ifdef S_ISLNK #ifdef S_ISLNK
if (symlink(header->linkname, header->name) < 0) { if (symlink(header->linkname, header->name) < 0) {
errorMsg("Error creating symlink '%s': %s", header->linkname, strerror(errno)); errorMsg("Error creating symlink '%s': %s\n", header->linkname, strerror(errno));
return; return;
} }
/* Try to change ownership of the symlink. /* Try to change ownership of the symlink.
@ -485,7 +485,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
else else
tarFd = open(tarName, O_RDONLY); tarFd = open(tarName, O_RDONLY);
if (tarFd < 0) { if (tarFd < 0) {
errorMsg( "Error opening '%s': %s", tarName, strerror(errno)); errorMsg( "Error opening '%s': %s\n", tarName, strerror(errno));
return ( FALSE); return ( FALSE);
} }
@ -600,7 +600,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
close(tarFd); close(tarFd);
if (status > 0) { if (status > 0) {
/* Bummer - we read a partial header */ /* Bummer - we read a partial header */
errorMsg( "Error reading '%s': %s", tarName, strerror(errno)); errorMsg( "Error reading '%s': %s\n", tarName, strerror(errno));
return ( FALSE); return ( FALSE);
} }
else else