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

8
cp.c
View File

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

2
include/libbb.h
View File

@ -273,7 +273,7 @@ char *simplify_path(const char *path);
enum { enum {
FILEUTILS_PRESERVE_STATUS = 1, FILEUTILS_PRESERVE_STATUS = 1,
FILEUTILS_PRESERVE_SYMLINKS = 2, FILEUTILS_DEREFERENCE = 2,
FILEUTILS_RECUR = 4, FILEUTILS_RECUR = 4,
FILEUTILS_FORCE = 8, FILEUTILS_FORCE = 8,
FILEUTILS_INTERACTIVE = 16 FILEUTILS_INTERACTIVE = 16

4
libbb/copy_file.c
View File

@ -40,9 +40,9 @@ int copy_file(const char *source, const char *dest, int flags)
int dest_exists = 1; int dest_exists = 1;
int status = 0; int status = 0;
if (((flags & FILEUTILS_PRESERVE_SYMLINKS) && if ((!(flags & FILEUTILS_DEREFERENCE) &&
lstat(source, &source_stat) < 0) || lstat(source, &source_stat) < 0) ||
(!(flags & FILEUTILS_PRESERVE_SYMLINKS) && ((flags & FILEUTILS_DEREFERENCE) &&
stat(source, &source_stat) < 0)) { stat(source, &source_stat) < 0)) {
perror_msg("%s", source); perror_msg("%s", source);
return -1; return -1;

2
libbb/libbb.h
View File

@ -273,7 +273,7 @@ char *simplify_path(const char *path);
enum { enum {
FILEUTILS_PRESERVE_STATUS = 1, FILEUTILS_PRESERVE_STATUS = 1,
FILEUTILS_PRESERVE_SYMLINKS = 2, FILEUTILS_DEREFERENCE = 2,
FILEUTILS_RECUR = 4, FILEUTILS_RECUR = 4,
FILEUTILS_FORCE = 8, FILEUTILS_FORCE = 8,
FILEUTILS_INTERACTIVE = 16 FILEUTILS_INTERACTIVE = 16

4
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 | if (copy_file(source, dest,
FILEUTILS_PRESERVE_SYMLINKS) < 0) FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS) < 0)
return -1; return -1;
if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0) if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0)