X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=cp.c;h=82d43adff625824fcc98ef535333797be8a840a9;hb=51ded05b3bf4df6f126420d39a40d27ea0728aa9;hp=254445f029703ed9db189906a5328ebcb0626798;hpb=91b2855ba8b9918b79dbe4b9188a3acccb41f7b7;p=oweals%2Fbusybox.git

diff --git a/cp.c b/cp.c
index 254445f02..82d43adff 100644
--- a/cp.c
+++ b/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)