From: Liu, Shuang (ADITG/ESM) Date: Wed, 13 Nov 2019 14:36:20 +0000 (+0000) Subject: chgrp: correct the usage for non-desktop chgrp calls X-Git-Tag: 1_32_0~103 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af6bc54fdefabae9ca433e515f7f1aa050184c9a;p=oweals%2Fbusybox.git chgrp: correct the usage for non-desktop chgrp calls When IF_DESKTOP is not defined, chown and chgrp only takes option -R -h, However the usage output of chgrp is wrong: $ ./busybox.nosuid chown Usage: chown [-Rh]... USER[:[GRP]] FILE... $ ./busybox.nosuid chgrp Usage: chgrp [-RhLHP]... GROUP FILE... $ ./busybox.nosuid chgrp -H group dummy chgrp: invalid option -- 'H' Usage: chgrp [-RhLHP]... GROUP FILE... The chgrp is now a wrapper of chown, so the recognized options shall be the same. This is introduced by 34425389e09353a8dacdd6b23a62553f699c544c I would expect the correct behavior shall be the same as chown. So suggest the below patch, the behavior shall be: $ ./busybox.nosuid chgrp Usage: chgrp [-Rh]... GROUP FILE... Signed-off-by: Shuang Liu Signed-off-by: Denys Vlasenko --- diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index ae216aa3f..4da43c45e 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c @@ -21,15 +21,15 @@ /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */ //usage:#define chgrp_trivial_usage -//usage: "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..." +//usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... GROUP FILE..." //usage:#define chgrp_full_usage "\n\n" //usage: "Change the group membership of each FILE to GROUP\n" //usage: "\n -R Recurse" //usage: "\n -h Affect symlinks instead of symlink targets" +//usage: IF_DESKTOP( //usage: "\n -L Traverse all symlinks to directories" //usage: "\n -H Traverse symlinks on command line only" //usage: "\n -P Don't traverse symlinks (default)" -//usage: IF_DESKTOP( //usage: "\n -c List changed files" //usage: "\n -v Verbose" //usage: "\n -f Hide errors"