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

copy fixes to simplify link copying and always do the right thing.

Browse Source 
ping could segfault because I'm an idiot, and tried to put a value
in where I hadn't allocated storage.  choke.
 -Erik
This commit is contained in:
Erik Andersen
2000-01-29 05:52:40 +00:00
parent d7a44c76fe
commit 8e759aa31f
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utility.c
View File

@ -182,6 +182,11 @@ copyFile( const char *srcName, const char *destName,
perror(destName);
return (FALSE);
}
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
if (setModes == TRUE) {
lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
}
#endif
} else if (S_ISFIFO(srcStatBuf.st_mode)) {
//fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
if (mkfifo(destName, 0644)) {
@ -225,16 +230,9 @@ copyFile( const char *srcName, const char *destName,
}
if (setModes == TRUE) {
if (! S_ISLNK(srcStatBuf.st_mode)) {
chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
/* Never chmod a symlink; it follows the link */
chmod(destName, srcStatBuf.st_mode);
}
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
else {
lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
}
#endif
/* This is fine, since symlinks never get here */
chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
chmod(destName, srcStatBuf.st_mode);
times.actime = srcStatBuf.st_atime;
times.modtime = srcStatBuf.st_mtime;
utime(destName, &times);