diff options
| author | Denis Vlasenko | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /coreutils/chown.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.zip busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'coreutils/chown.c')
| -rw-r--r-- | coreutils/chown.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/chown.c b/coreutils/chown.c index 3452492..2d8e556 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -16,13 +16,13 @@ /* This is a NOEXEC applet. Be very careful! */ -#define OPT_STR ("Rh" USE_DESKTOP("vcfLHP")) +#define OPT_STR ("Rh" IF_DESKTOP("vcfLHP")) #define BIT_RECURSE 1 #define OPT_RECURSE (opt & 1) #define OPT_NODEREF (opt & 2) -#define OPT_VERBOSE (USE_DESKTOP(opt & 0x04) SKIP_DESKTOP(0)) -#define OPT_CHANGED (USE_DESKTOP(opt & 0x08) SKIP_DESKTOP(0)) -#define OPT_QUIET (USE_DESKTOP(opt & 0x10) SKIP_DESKTOP(0)) +#define OPT_VERBOSE (IF_DESKTOP(opt & 0x04) IF_NOT_DESKTOP(0)) +#define OPT_CHANGED (IF_DESKTOP(opt & 0x08) IF_NOT_DESKTOP(0)) +#define OPT_QUIET (IF_DESKTOP(opt & 0x10) IF_NOT_DESKTOP(0)) /* POSIX options * -L traverse every symbolic link to a directory encountered * -H if a command line argument is a symbolic link to a directory, traverse it @@ -32,10 +32,10 @@ * The last option specified shall determine the behavior of the utility." */ /* -L */ #define BIT_TRAVERSE 0x20 -#define OPT_TRAVERSE (USE_DESKTOP(opt & BIT_TRAVERSE) SKIP_DESKTOP(0)) +#define OPT_TRAVERSE (IF_DESKTOP(opt & BIT_TRAVERSE) IF_NOT_DESKTOP(0)) /* -H or -L */ #define BIT_TRAVERSE_TOP (0x20|0x40) -#define OPT_TRAVERSE_TOP (USE_DESKTOP(opt & BIT_TRAVERSE_TOP) SKIP_DESKTOP(0)) +#define OPT_TRAVERSE_TOP (IF_DESKTOP(opt & BIT_TRAVERSE_TOP) IF_NOT_DESKTOP(0)) typedef int (*chown_fptr)(const char *, uid_t, gid_t); @@ -85,7 +85,7 @@ int chown_main(int argc UNUSED_PARAM, char **argv) /* This matches coreutils behavior (almost - see below) */ if (OPT_NODEREF /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */ - USE_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) + IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) ) { param.chown_func = lchown; } |