From: Matt Kraai Date: Tue, 24 Apr 2001 01:30:02 +0000 (-0000) Subject: Use generic flag names. X-Git-Tag: 0_52~306 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=01441036e9754425e2b09b43deec879ca46206cb;p=oweals%2Fbusybox.git Use generic flag names. --- 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) 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 13d1aae5b..efc4ae6d8 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(); 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) diff --git a/include/libbb.h b/include/libbb.h index 4eeb99343..404d7076c 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -255,11 +255,11 @@ extern int gz_open(FILE *compressed_file, int *pid); /* extern int convert(char *fn, int ConvType); */ enum { - CP_PRESERVE_STATUS = 1, - CP_PRESERVE_SYMLINKS = 2, - CP_RECUR = 4, - CP_FORCE = 8, - CP_INTERACTIVE = 16 + FILEUTILS_PRESERVE_STATUS = 1, + FILEUTILS_PRESERVE_SYMLINKS = 2, + FILEUTILS_RECUR = 4, + FILEUTILS_FORCE = 8, + FILEUTILS_INTERACTIVE = 16 }; extern const char *applet_name; diff --git a/libbb/copy_file.c b/libbb/copy_file.c index f24d1b119..4ee3efdbc 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c @@ -39,8 +39,9 @@ int copy_file(const char *source, const char *dest, int flags) int dest_exists = 1; int status = 0; - if (((flags & CP_PRESERVE_SYMLINKS) && lstat(source, &source_stat) < 0) || - (!(flags & CP_PRESERVE_SYMLINKS) && + if (((flags & FILEUTILS_PRESERVE_SYMLINKS) && + lstat(source, &source_stat) < 0) || + (!(flags & FILEUTILS_PRESERVE_SYMLINKS) && stat(source, &source_stat) < 0)) { perror_msg("%s", source); return -1; @@ -64,7 +65,7 @@ int copy_file(const char *source, const char *dest, int flags) DIR *dp; struct dirent *d; - if (!(flags & CP_RECUR)) { + if (!(flags & FILEUTILS_RECUR)) { error_msg("%s: omitting directory", source); return -1; } @@ -80,7 +81,7 @@ int copy_file(const char *source, const char *dest, int flags) saved_umask = umask(0); mode = source_stat.st_mode; - if (!(flags & CP_PRESERVE_STATUS)) + if (!(flags & FILEUTILS_PRESERVE_STATUS)) mode = source_stat.st_mode & ~saved_umask; mode |= S_IRWXU; @@ -125,14 +126,14 @@ int copy_file(const char *source, const char *dest, int flags) FILE *sfp, *dfp; if (dest_exists) { - if (flags & CP_INTERACTIVE) { + if (flags & FILEUTILS_INTERACTIVE) { fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest); if (!ask_confirmation()) return 0; } if ((dfp = fopen(dest, "w")) == NULL) { - if (!(flags & CP_FORCE)) { + if (!(flags & FILEUTILS_FORCE)) { perror_msg("unable to open `%s'", dest); return -1; } @@ -187,7 +188,7 @@ int copy_file(const char *source, const char *dest, int flags) saved_umask = umask(0); mode = source_stat.st_mode; - if (!(flags & CP_PRESERVE_STATUS)) + if (!(flags & FILEUTILS_PRESERVE_STATUS)) mode = source_stat.st_mode & ~saved_umask; mode |= S_IRWXU; @@ -213,7 +214,7 @@ int copy_file(const char *source, const char *dest, int flags) } #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - if (flags & CP_PRESERVE_STATUS) + if (flags & FILEUTILS_PRESERVE_STATUS) if (lchown(dest, source_stat.st_uid, source_stat.st_gid) < 0) perror_msg("unable to preserve ownership of `%s'", dest); #endif @@ -225,7 +226,7 @@ int copy_file(const char *source, const char *dest, int flags) end: - if (flags & CP_PRESERVE_STATUS) { + if (flags & FILEUTILS_PRESERVE_STATUS) { struct utimbuf times; times.actime = source_stat.st_atime; diff --git a/libbb/libbb.h b/libbb/libbb.h index 4eeb99343..404d7076c 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -255,11 +255,11 @@ extern int gz_open(FILE *compressed_file, int *pid); /* extern int convert(char *fn, int ConvType); */ enum { - CP_PRESERVE_STATUS = 1, - CP_PRESERVE_SYMLINKS = 2, - CP_RECUR = 4, - CP_FORCE = 8, - CP_INTERACTIVE = 16 + FILEUTILS_PRESERVE_STATUS = 1, + FILEUTILS_PRESERVE_SYMLINKS = 2, + FILEUTILS_RECUR = 4, + FILEUTILS_FORCE = 8, + FILEUTILS_INTERACTIVE = 16 }; extern const char *applet_name; diff --git a/mv.c b/mv.c index 13d1aae5b..efc4ae6d8 100644 --- a/mv.c +++ b/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();