diff options
| author | Matt Kraai <kraai@debian.org> | 2001-04-24 01:30:02 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-04-24 01:30:02 +0000 |
| commit | 01441036e9754425e2b09b43deec879ca46206cb (patch) | |
| tree | d9d4c66bb7d2142dd525adfa3a9cae07e3f80557 /coreutils/cp.c | |
| parent | 9ff9325e60eac6cc119eab5dff0dbbba78edfd32 (diff) | |
| download | busybox-w32-01441036e9754425e2b09b43deec879ca46206cb.tar.gz busybox-w32-01441036e9754425e2b09b43deec879ca46206cb.tar.bz2 busybox-w32-01441036e9754425e2b09b43deec879ca46206cb.zip | |
Use generic flag names.
Diffstat (limited to 'coreutils/cp.c')
| -rw-r--r-- | coreutils/cp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index 254445f02..82d43adff 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
| @@ -42,22 +42,22 @@ extern int cp_main(int argc, char **argv) | |||
| 42 | while ((opt = getopt(argc, argv, "adfipR")) != -1) | 42 | while ((opt = getopt(argc, argv, "adfipR")) != -1) |
| 43 | switch (opt) { | 43 | switch (opt) { |
| 44 | case 'a': | 44 | case 'a': |
| 45 | flags |= CP_PRESERVE_STATUS | CP_RECUR; | 45 | flags |= FILEUTILS_PRESERVE_STATUS | FILEUTILS_RECUR; |
| 46 | /* fallthrough */ | 46 | /* fallthrough */ |
| 47 | case 'd': | 47 | case 'd': |
| 48 | flags |= CP_PRESERVE_SYMLINKS; | 48 | flags |= FILEUTILS_PRESERVE_SYMLINKS; |
| 49 | break; | 49 | break; |
| 50 | case 'f': | 50 | case 'f': |
| 51 | flags |= CP_FORCE; | 51 | flags |= FILEUTILS_FORCE; |
| 52 | break; | 52 | break; |
| 53 | case 'i': | 53 | case 'i': |
| 54 | flags |= CP_INTERACTIVE; | 54 | flags |= FILEUTILS_INTERACTIVE; |
| 55 | break; | 55 | break; |
| 56 | case 'p': | 56 | case 'p': |
| 57 | flags |= CP_PRESERVE_STATUS; | 57 | flags |= FILEUTILS_PRESERVE_STATUS; |
| 58 | break; | 58 | break; |
| 59 | case 'R': | 59 | case 'R': |
| 60 | flags |= CP_RECUR; | 60 | flags |= FILEUTILS_RECUR; |
| 61 | break; | 61 | break; |
| 62 | default: | 62 | default: |
| 63 | show_usage(); | 63 | show_usage(); |
| @@ -73,9 +73,9 @@ extern int cp_main(int argc, char **argv) | |||
| 73 | int source_exists = 1; | 73 | int source_exists = 1; |
| 74 | int dest_exists = 1; | 74 | int dest_exists = 1; |
| 75 | 75 | ||
| 76 | if (((flags & CP_PRESERVE_SYMLINKS) && | 76 | if (((flags & FILEUTILS_PRESERVE_SYMLINKS) && |
| 77 | lstat(argv[optind], &source_stat) < 0) || | 77 | lstat(argv[optind], &source_stat) < 0) || |
| 78 | (!(flags & CP_PRESERVE_SYMLINKS) && | 78 | (!(flags & FILEUTILS_PRESERVE_SYMLINKS) && |
| 79 | stat(argv[optind], &source_stat))) { | 79 | stat(argv[optind], &source_stat))) { |
| 80 | if (errno != ENOENT) | 80 | if (errno != ENOENT) |
| 81 | perror_msg_and_die("unable to stat `%s'", argv[optind]); | 81 | perror_msg_and_die("unable to stat `%s'", argv[optind]); |
| @@ -93,7 +93,7 @@ extern int cp_main(int argc, char **argv) | |||
| 93 | (!dest_exists || !S_ISDIR(dest_stat.st_mode))) || | 93 | (!dest_exists || !S_ISDIR(dest_stat.st_mode))) || |
| 94 | /* ...recursing, the first is a directory, and the | 94 | /* ...recursing, the first is a directory, and the |
| 95 | * second doesn't exist, then... */ | 95 | * second doesn't exist, then... */ |
| 96 | ((flags & CP_RECUR) && S_ISDIR(source_stat.st_mode) && | 96 | ((flags & FILEUTILS_RECUR) && S_ISDIR(source_stat.st_mode) && |
| 97 | !dest_exists)) { | 97 | !dest_exists)) { |
| 98 | /* ...do a simple copy. */ | 98 | /* ...do a simple copy. */ |
| 99 | if (copy_file(argv[optind], argv[optind + 1], flags) < 0) | 99 | if (copy_file(argv[optind], argv[optind + 1], flags) < 0) |