Use generic flag names.

2 files changed, 18 insertions, 18 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 254445f..82d43ad 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -42,22 +42,22 @@ extern int cp_main(int argc, char **argv)
 	while ((opt = getopt(argc, argv, "adfipR")) != -1)
 		switch (opt) {
 		case 'a':
-			flags |= CP_PRESERVE_STATUS | CP_RECUR;
+			flags |= FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR;
 			/* fallthrough */
 		case 'd':
-			flags |= CP_PRESERVE_SYMLINKS;
+			flags |= FILEUTILS_PRESERVE_SYMLINKS;
 			break;
 		case 'f':
-			flags |= CP_FORCE;
+			flags |= FILEUTILS_FORCE;
 			break;
 		case 'i':
-			flags |= CP_INTERACTIVE;
+			flags |= FILEUTILS_INTERACTIVE;
 			break;
 		case 'p':
-			flags |= CP_PRESERVE_STATUS;
+			flags |= FILEUTILS_PRESERVE_STATUS;
 			break;
 		case 'R':
-			flags |= CP_RECUR;
+			flags |= FILEUTILS_RECUR;
 			break;
 		default:
 			show_usage();
@@ -73,9 +73,9 @@ extern int cp_main(int argc, char **argv)
 		int source_exists = 1;
 		int dest_exists = 1;
 
-		if (((flags & CP_PRESERVE_SYMLINKS) &&
+		if (((flags & FILEUTILS_PRESERVE_SYMLINKS) &&
 				lstat(argv[optind], &source_stat) < 0) ||
-				(!(flags & CP_PRESERVE_SYMLINKS) &&
+				(!(flags & FILEUTILS_PRESERVE_SYMLINKS) &&
 				 stat(argv[optind], &source_stat))) {
 			if (errno != ENOENT)
 				perror_msg_and_die("unable to stat `%s'", argv[optind]);
@@ -93,7 +93,7 @@ extern int cp_main(int argc, char **argv)
 				(!dest_exists || !S_ISDIR(dest_stat.st_mode))) ||
 				/* ...recursing, the first is a directory, and the
 				 * second doesn't exist, then... */
-				((flags & CP_RECUR) && S_ISDIR(source_stat.st_mode) &&
+				((flags & FILEUTILS_RECUR) && S_ISDIR(source_stat.st_mode) &&
 				 !dest_exists)) {
 			/* ...do a simple copy.  */
 			if (copy_file(argv[optind], argv[optind + 1], flags) < 0)
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 13d1aae..efc4ae6 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -30,7 +30,7 @@
 
 #include "busybox.h"
 
-static int flags = CP_RECUR | CP_PRESERVE_STATUS | CP_PRESERVE_SYMLINKS;
+static int flags;
 
 static int remove_file(const char *path, struct stat *statbuf, void *junk)
 {
@@ -88,8 +88,8 @@ static int manual_rename(const char *source, const char *dest)
 		}
 	}
 
-	if (copy_file(source, dest,
-				CP_RECUR | CP_PRESERVE_STATUS | CP_PRESERVE_SYMLINKS) < 0)
+	if (copy_file(source, dest, FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS |
+			FILEUTILS_PRESERVE_SYMLINKS) < 0)
 		return -1;
 
 	if (!recursive_action(source, TRUE, FALSE, TRUE, remove_file,
@@ -112,9 +112,9 @@ static int move_file(const char *source, const char *dest)
 		dest_exists = 0;
 	}
 
-	if (dest_exists && !(flags & CP_FORCE) &&
+	if (dest_exists && !(flags & FILEUTILS_FORCE) &&
 			((access(dest, W_OK) < 0 && isatty(0)) ||
-			 (flags & CP_INTERACTIVE))) {
+			 (flags & FILEUTILS_INTERACTIVE))) {
 		fprintf(stderr, "mv: overwrite `%s'? ", dest);
 		if (!ask_confirmation())
 			return 0;
@@ -140,12 +140,12 @@ extern int mv_main(int argc, char **argv)
 	while ((opt = getopt(argc, argv, "fi")) != -1)
 		switch (opt) {
 		case 'f':
-			flags &= ~CP_INTERACTIVE;
-			flags |= CP_FORCE;
+			flags &= ~FILEUTILS_INTERACTIVE;
+			flags |= FILEUTILS_FORCE;
 			break;
 		case 'i':
-			flags &= ~CP_FORCE;
-			flags |= CP_INTERACTIVE;
+			flags &= ~FILEUTILS_FORCE;
+			flags |= FILEUTILS_INTERACTIVE;
 			break;
 		default:
 			show_usage();