*: shrink: use Vladimir's "o+" specifier instead of xatou(opt_param)

function                                             old     new   delta
getopt32                                            1370    1385     +15
sulogin_main                                         490     494      +4
realpath_main                                         84      86      +2
sleep_main                                            76      77      +1
mt_main                                              256     257      +1
printenv_main                                         75      74      -1
fdformat_main                                        546     545      -1
usleep_main                                           44      42      -2
setlogcons_main                                       77      75      -2
ed_main                                             2654    2649      -5
deallocvt_main                                        69      64      -5
addgroup_main                                        373     368      -5
mkfs_minix_main                                     2989    2982      -7
tail_main                                           1221    1213      -8
sv_main                                             1254    1241     -13
du_main                                              348     328     -20
tftp_main                                            325     302     -23
split_main                                           581     558     -23
nc_main                                             1000     977     -23
diff_main                                            891     868     -23
arping_main                                         1797    1770     -27
ls_main                                              893     847     -46
od_main                                             2797    2750     -47
readprofile_main                                    1944    1895     -49
tcpudpsvd_main                                      1973    1922     -51
udhcpc_main                                         2590    2513     -77
grep_main                                            824     722    -102
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/22 up/down: 23/-560)         Total: -537 bytes
   text    data     bss     dec     hex filename
 796973     658    7428  805059   c48c3 busybox_old
 796479     662    7420  804561   c46d1 busybox_unstripped

1 files changed, 8 insertions, 9 deletions

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 576b1cbb8..fe8f4c8fa 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -132,7 +132,7 @@ int udhcpc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
         uint8_t *temp, *message;
-        char *str_c, *str_V, *str_h, *str_F, *str_r, *str_T, *str_A, *str_t;
+        char *str_c, *str_V, *str_h, *str_F, *str_r;
         USE_FEATURE_UDHCP_PORT(char *str_P;)
         llist_t *list_O = NULL;
 #if ENABLE_FEATURE_UDHCPC_ARPING
@@ -223,7 +223,8 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
         client_config.script = DEFAULT_SCRIPT;
 
         /* Parse command line */
-        opt_complementary = "c--C:C--c:O::"; // Cc: mutually exclusive; O: list
+        /* Cc: mutually exclusive; O: list; -T,-t,-A take numeric param */
+        opt_complementary = "c--C:C--c:O::T+:t+:A+";
 #if ENABLE_GETOPT_LONG
         applet_long_options = udhcpc_longopts;
 #endif
@@ -233,7 +234,8 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 "O:"
                 , &str_c, &str_V, &str_h, &str_h, &str_F
                 , &client_config.interface, &client_config.pidfile, &str_r
-                , &client_config.script, &str_T, &str_t, &str_A
+                , &client_config.script
+                , &discover_timeout, &discover_retries, &tryagain_timeout
                 USE_FEATURE_UDHCPC_ARPING(, &str_W)
                 USE_FEATURE_UDHCP_PORT(, &str_P)
                 , &list_O
@@ -273,12 +275,9 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
         if (opt & OPT_r)
                 requested_ip = inet_addr(str_r);
         // if (opt & OPT_s) client_config.script = ...
-        if (opt & OPT_T)
-                discover_timeout = xatoi_u(str_T);
-        if (opt & OPT_t)
-                discover_retries = xatoi_u(str_t);
-        if (opt & OPT_A)
-                tryagain_timeout = xatoi_u(str_A);
+        // if (opt & OPT_T) discover_timeout = xatoi_u(str_T);
+        // if (opt & OPT_t) discover_retries = xatoi_u(str_t);
+        // if (opt & OPT_A) tryagain_timeout = xatoi_u(str_A);
         if (opt & OPT_v) {
                 puts("version "BB_VER);
                 return 0;