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

Fix a tar bug: tar removed leading '/'s for symlink targets.

Browse Source 
Fix a syslogd bug: Only the first sizeof(buffer) was read from the
/dev/log socket, causing (for most cases) only every other log item to be logged.
 -Erik
This commit is contained in:
Erik Andersen
2000-04-14 21:45:29 +00:00
parent d5ba77d03e
commit 95c1c1e05f
6 changed files with 48 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
archival/tar.c
View File

@ -493,18 +493,6 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum));
header->type = rawHeader->typeflag;
header->linkname = rawHeader->linkname;
/* Check for and relativify any absolute paths */
if ( *(header->linkname) == '/' ) {
static int alreadyWarned=FALSE;
while (*(header->linkname) == '/')
++*(header->linkname);
if (alreadyWarned == FALSE) {
errorMsg("tar: Removing leading '/' from link names\n");
alreadyWarned = TRUE;
}
}
header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor));
header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor));
@ -826,7 +814,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *st
if (! *header.uname)
strcpy(header.uname, "root");
// FIXME (or most likely not): I break Hard Links
/* WARNING/NOTICE: I break Hard Links */
if (S_ISLNK(statbuf->st_mode)) {
char buffer[BUFSIZ];
header.typeflag = SYMTYPE;
@ -834,17 +822,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *fileName, struct stat *st
errorMsg("Error reading symlink '%s': %s\n", header.name, strerror(errno));
return ( FALSE);
}
if (*buffer=='/') {
static int alreadyWarned=FALSE;
if (alreadyWarned==FALSE) {
errorMsg("tar: Removing leading '/' from link names\n");
alreadyWarned=TRUE;
}
strncpy(header.linkname, buffer+1, sizeof(header.linkname));
}
else {
strncpy(header.linkname, buffer, sizeof(header.linkname));
}
strncpy(header.linkname, buffer, sizeof(header.linkname));
} else if (S_ISDIR(statbuf->st_mode)) {
header.typeflag = DIRTYPE;
strncat(header.name, "/", sizeof(header.name));