summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenis Vlasenko2007-07-21 13:27:44 +0000
committerDenis Vlasenko2007-07-21 13:27:44 +0000
commit091965768da4175d3763e61db56bba058d68ae3b (patch)
tree011719c7b70c58099641d98244ea1aad9b2a8e5d /util-linux
parent557fb713e0f943ac9b87c9f3804ba24e73d55bb0 (diff)
downloadbusybox-091965768da4175d3763e61db56bba058d68ae3b.zip
busybox-091965768da4175d3763e61db56bba058d68ae3b.tar.gz
libbb: nuke BB_GETOPT_ERROR, always die if there are mutually exclusive options
find_pair 164 180 +16 passwd_main 1222 1230 +8 display_speed 91 96 +5 msh_main 1335 1339 +4 qrealloc 38 36 -2 refresh 1190 1182 -8 cut_main 543 532 -11 sendCgi 1807 1794 -13 getopt32 1063 1045 -18 arith 2077 2030 -47 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/6 up/down: 33/-99) Total: -66 bytes text data bss dec hex filename 781548 1168 11900 794616 c1ff8 busybox_old 781452 1168 11900 794520 c1f98 busybox_unstripped
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/getopt.c2
-rw-r--r--util-linux/hwclock.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 06c3488..a5e6743 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -318,7 +318,7 @@ int getopt_main(int argc, char *argv[])
opt = getopt32(argc, argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
#else
applet_long_options = longopts;
- opt_complementary = "?:l::";
+ opt_complementary = "l::";
opt = getopt32(argc, argv, "+o:n:qQs:Tual:",
&optstr, &name, &s_arg, &l_arg);
/* Effectuate the read options for the applet itself */
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 8b65df6..882a0c5 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -189,7 +189,7 @@ int hwclock_main(int argc, char **argv)
};
applet_long_options = hwclock_long_options;
#endif
- opt_complementary = "?:r--ws:w--rs:s--wr:l--u:u--l";
+ opt_complementary = "r--ws:w--rs:s--wr:l--u:u--l";
opt = getopt32(argc, argv, "lurswf:", &rtcname);
/* If -u or -l wasn't given check if we are using utc */