X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchown.c;h=2d8e556f06029f2ed5f7e2e117db952d8b290a32;hb=8d680b51148b9cbe7dd3afd37022f3390dd999ef;hp=7579e17358549affe6af0a1f2fa6d08dfd9f9000;hpb=b6adbf1be29841501cc49917249e85f273e1df7c;p=oweals%2Fbusybox.git diff --git a/coreutils/chown.c b/coreutils/chown.c index 7579e1735..2d8e556f0 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 (option_mask32 & 1) -#define OPT_NODEREF (option_mask32 & 2) -#define OPT_VERBOSE (USE_DESKTOP(option_mask32 & 0x04) SKIP_DESKTOP(0)) -#define OPT_CHANGED (USE_DESKTOP(option_mask32 & 0x08) SKIP_DESKTOP(0)) -#define OPT_QUIET (USE_DESKTOP(option_mask32 & 0x10) SKIP_DESKTOP(0)) +#define OPT_RECURSE (opt & 1) +#define OPT_NODEREF (opt & 2) +#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,22 +32,27 @@ * The last option specified shall determine the behavior of the utility." */ /* -L */ #define BIT_TRAVERSE 0x20 -#define OPT_TRAVERSE (USE_DESKTOP(option_mask32 & 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(option_mask32 & 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); -static struct bb_uidgid_t ugid = { -1, -1 }; +struct param_t { + struct bb_uidgid_t ugid; + chown_fptr chown_func; +}; -static int fileAction(const char *fileName, struct stat *statbuf, - void *cf, int depth) +static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf, + void *vparam, int depth UNUSED_PARAM) { - uid_t u = (ugid.uid == (uid_t)-1) ? statbuf->st_uid : ugid.uid; - gid_t g = (ugid.gid == (gid_t)-1) ? statbuf->st_gid : ugid.gid; +#define param (*(struct param_t*)vparam) +#define opt option_mask32 + uid_t u = (param.ugid.uid == (uid_t)-1) ? statbuf->st_uid : param.ugid.uid; + gid_t g = (param.ugid.gid == (gid_t)-1) ? statbuf->st_gid : param.ugid.gid; - if (!((chown_fptr)cf)(fileName, u, g)) { + if (param.chown_func(fileName, u, g) == 0) { if (OPT_VERBOSE || (OPT_CHANGED && (statbuf->st_uid != u || statbuf->st_gid != g)) ) { @@ -57,56 +62,56 @@ static int fileAction(const char *fileName, struct stat *statbuf, return TRUE; } if (!OPT_QUIET) - bb_perror_msg("%s", fileName); /* A filename can have % in it... */ + bb_simple_perror_msg(fileName); /* A filename can have % in it... */ return FALSE; +#undef opt +#undef param } -int chown_main(int argc, char **argv); -int chown_main(int argc, char **argv) +int chown_main(int argc UNUSED_PARAM, char **argv) { int retval = EXIT_SUCCESS; - chown_fptr chown_func; + int opt, flags; + struct param_t param; + + param.ugid.uid = -1; + param.ugid.gid = -1; + param.chown_func = chown; opt_complementary = "-2"; - getopt32(argc, argv, OPT_STR); + opt = getopt32(argv, OPT_STR); argv += optind; /* This matches coreutils behavior (almost - see below) */ - chown_func = chown; if (OPT_NODEREF /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */ - USE_DESKTOP( || (option_mask32 & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) + IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) ) { - chown_func = lchown; + param.chown_func = lchown; } - parse_chown_usergroup_or_die(&ugid, argv[0]); + flags = ACTION_DEPTHFIRST; /* match coreutils order */ + if (OPT_RECURSE) + flags |= ACTION_RECURSE; + if (OPT_TRAVERSE_TOP) + flags |= ACTION_FOLLOWLINKS_L0; /* -H/-L: follow links on depth 0 */ + if (OPT_TRAVERSE) + flags |= ACTION_FOLLOWLINKS; /* follow links if -L */ + + parse_chown_usergroup_or_die(¶m.ugid, argv[0]); /* Ok, ready to do the deed now */ argv++; do { - char *arg = *argv; - - if (OPT_TRAVERSE_TOP) { - /* resolves symlink (even recursive) */ - arg = xmalloc_realpath(arg); - if (!arg) - continue; - } - - if (!recursive_action(arg, - (OPT_RECURSE ? ACTION_RECURSE : 0) | /* recurse */ - (OPT_TRAVERSE ? ACTION_FOLLOWLINKS : 0),/* follow links if -L */ + if (!recursive_action(*argv, + flags, /* flags */ fileAction, /* file action */ fileAction, /* dir action */ - chown_func, /* user data */ + ¶m, /* user data */ 0) /* depth */ ) { retval = EXIT_FAILURE; } - - if (OPT_TRAVERSE_TOP) - free(arg); } while (*++argv); return retval; @@ -137,8 +142,10 @@ create() { tst() { create test1 create test2 - (cd test1; $t1 $1) - (cd test2; $t2 $1) + echo "[$1]" >>test1.out + echo "[$1]" >>test2.out + (cd test1; $t1 $1) >>test1.out 2>&1 + (cd test2; $t2 $1) >>test2.out 2>&1 (cd test1; ls -lnR) >out1 (cd test2; ls -lnR) >out2 echo "chown $1" >out.diff @@ -152,18 +159,22 @@ tst_for_each() { tst "$1 1:1 linkfile" } echo "If script produced 'out.diff' file, then at least one testcase failed" +>test1.out +>test2.out # These match coreutils 6.8: -tst_for_each "" -tst_for_each "-R" -tst_for_each "-RP" -tst_for_each "-RL" -tst_for_each "-RH" -tst_for_each "-h" -tst_for_each "-hR" -tst_for_each "-hRP" -# Below: with "chown linkdir" coreutils 6.8 will chown linkdir _target_, -# we lchown _the link_. I believe we are "more correct". -#tst_for_each "-hRL" -#tst_for_each "-hRH" +tst_for_each "-v" +tst_for_each "-vR" +tst_for_each "-vRP" +tst_for_each "-vRL" +tst_for_each "-vRH" +tst_for_each "-vh" +tst_for_each "-vhR" +tst_for_each "-vhRP" +tst_for_each "-vhRL" +tst_for_each "-vhRH" +# Fix `name' in coreutils output +sed 's/`/'"'"'/g' -i test2.out +# Compare us with coreutils output +diff -u test1.out test2.out */