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

Invert FILEUTILS_PRESERVE_SYMLINKS into FILEUTILS_DEREFERENCE.

Browse Source
This commit is contained in:
Matt Kraai
2001-10-05 01:35:10 +00:00
parent 54a992d81e
commit 4c557bf576
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils/cp.c
View File

@@ -36,7 +36,7 @@ extern int cp_main(int argc, char **argv)
{
int status = 0;
int opt;
int flags = 0;
int flags = FILEUTILS_DEREFERENCE;
int i;
while ((opt = getopt(argc, argv, "adfipR")) != -1)
@@ -45,7 +45,7 @@ extern int cp_main(int argc, char **argv)
flags |= FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR;
/* fallthrough */
case 'd':
flags |= FILEUTILS_PRESERVE_SYMLINKS;
flags &= ~FILEUTILS_DEREFERENCE;
break;
case 'f':
flags |= FILEUTILS_FORCE;
@@ -73,9 +73,9 @@ extern int cp_main(int argc, char **argv)
int source_exists = 1;
int dest_exists = 1;
if (((flags & FILEUTILS_PRESERVE_SYMLINKS) &&
if ((!(flags & FILEUTILS_DEREFERENCE) &&
lstat(argv[optind], &source_stat) < 0) ||
(!(flags & FILEUTILS_PRESERVE_SYMLINKS) &&
((flags & FILEUTILS_DEREFERENCE) &&
stat(argv[optind], &source_stat))) {
if (errno != ENOENT)
perror_msg_and_die("unable to stat `%s'", argv[optind]);

4
coreutils/mv.c
View File

@@ -74,8 +74,8 @@ static int manual_rename(const char *source, const char *dest)
}
}
if (copy_file(source, dest, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS |
FILEUTILS_PRESERVE_SYMLINKS) < 0)
if (copy_file(source, dest,
FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS) < 0)
return -1;
if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0)