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
This commit is contained in:
Denis Vlasenko
2007-07-21 13:27:44 +00:00
parent 557fb713e0
commit 091965768d
18 changed files with 28 additions and 45 deletions

View File

@@ -210,7 +210,7 @@ int udhcpc_main(int argc, char **argv)
client_config.timeout = 3;
/* Parse command line */
opt_complementary = "?:c--C:C--c" // mutually exclusive
opt_complementary = "c--C:C--c" // mutually exclusive
":hH:Hh"; // -h and -H are the same
#if ENABLE_GETOPT_LONG
applet_long_options = arg_options;

View File

@@ -33,7 +33,7 @@ int dumpleases_main(int argc, char **argv)
applet_long_options = options;
#endif
opt_complementary = "=0:?:a--r:r--a";
opt_complementary = "=0:a--r:r--a";
opt = getopt32(argc, argv, "arf:", &file);
fd = xopen(file, O_RDONLY);