svn commit: trunk/busybox/selinux
vda at busybox.net
vda at busybox.net
Mon Mar 12 10:41:24 UTC 2007
Author: vda
Date: 2007-03-12 03:41:23 -0700 (Mon, 12 Mar 2007)
New Revision: 18070
Log:
chcon: exclude constraints for impossible option if long opts are off
Modified:
trunk/busybox/selinux/chcon.c
Changeset:
Modified: trunk/busybox/selinux/chcon.c
===================================================================
--- trunk/busybox/selinux/chcon.c 2007-03-12 08:55:20 UTC (rev 18069)
+++ trunk/busybox/selinux/chcon.c 2007-03-12 10:41:23 UTC (rev 18070)
@@ -133,9 +133,12 @@
#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
applet_long_options = chcon_options;
#endif
- opt_complementary = "-1" /* at least 1 param */
- ":?:f--v:v--f" /* 'verbose' and 'quiet' are exclusive */
- ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff";
+ opt_complementary = "-1" /* at least 1 param */
+ ":?" /* error if exclusivity constraints are violated */
+#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+ ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
+#endif
+ ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */
getopt32(argc, argv, "Rchf:u:r:t:l:v",
&user, &role, &type, &range, &reference_file);
argv += optind;
More information about the busybox-cvs
mailing list