emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chgrp: correct the usage for non-desktop chgrp calls

Browse Source 
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 34425389e0

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 <sliu@de.adit-jv.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Liu, Shuang (ADITG/ESM) 2019-11-13 14:36:20 +00:00 committed by Denys Vlasenko
parent b230fdfa9d
commit af6bc54fde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils/chgrp.c
View File

@ -21,15 +21,15 @@
/* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */
//usage:#define chgrp_trivial_usage //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:#define chgrp_full_usage "\n\n"
//usage: "Change the group membership of each FILE to GROUP\n" //usage: "Change the group membership of each FILE to GROUP\n"
//usage: "\n -R Recurse" //usage: "\n -R Recurse"
//usage: "\n -h Affect symlinks instead of symlink targets" //usage: "\n -h Affect symlinks instead of symlink targets"
//usage: IF_DESKTOP(
//usage: "\n -L Traverse all symlinks to directories" //usage: "\n -L Traverse all symlinks to directories"
//usage: "\n -H Traverse symlinks on command line only" //usage: "\n -H Traverse symlinks on command line only"
//usage: "\n -P Don't traverse symlinks (default)" //usage: "\n -P Don't traverse symlinks (default)"
//usage: IF_DESKTOP(
//usage: "\n -c List changed files" //usage: "\n -c List changed files"
//usage: "\n -v Verbose" //usage: "\n -v Verbose"
//usage: "\n -f Hide errors" //usage: "\n -f Hide errors"