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

Fix a bug where tar could change perms and ownership of dirs pointed

Browse Source 
to by symlink within a tarball.
 -Erik
This commit is contained in:
Erik Andersen
2000-01-23 02:14:20 +00:00
parent de552874d2
commit 06936df164
5 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
archival/tar.c
View File

@@ -542,8 +542,10 @@ readHeader (const TarHeader * hp, int fileCount, char **fileTable)
printf ("x %s\n", outName);
if (hardLink) {
if (link (hp->linkName, outName) < 0)
if (link (hp->linkName, outName) < 0) {
perror (outName);
return;
}
/* Set the file time */
utb.actime = mtime;
utb.modtime = mtime;
@@ -556,8 +558,10 @@ readHeader (const TarHeader * hp, int fileCount, char **fileTable)
if (softLink) {
#ifdef S_ISLNK
if (symlink (hp->linkName, outName) < 0)
if (symlink (hp->linkName, outName) < 0) {
perror (outName);
return;
}
/* Try to change ownership of the symlink.
* If libs doesn't support that, don't bother.
* Changing the pointed-to file is the Wrong Thing(tm).
@@ -582,15 +586,16 @@ readHeader (const TarHeader * hp, int fileCount, char **fileTable)
* If the file is a directory, then just create the path.
*/
if (S_ISDIR (mode)) {
createPath (outName, mode);
/* Set the file time */
utb.actime = mtime;
utb.modtime = mtime;
utime (outName, &utb);
/* Set the file permissions */
chown(outName, uid, gid);
chmod(outName, mode);
return;
if (createPath (outName, mode)==TRUE) {
/* Set the file time */
utb.actime = mtime;
utb.modtime = mtime;
utime (outName, &utb);
/* Set the file permissions */
chown(outName, uid, gid);
chmod(outName, mode);
return;
}
}
/*