*: 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, 11 deletions

diff --git a/ipsvd/tcpudp.c b/ipsvd/tcpudp.c
index 8f23ca640..8f6616fe0 100644
--- a/ipsvd/tcpudp.c
+++ b/ipsvd/tcpudp.c
@@ -163,7 +163,7 @@ static void sig_child_handler(int sig ATTRIBUTE_UNUSED)
 int tcpudpsvd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tcpudpsvd_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
-        char *str_c, *str_C, *str_b, *str_t;
+        char *str_C, *str_t;
         char *user;
         struct hcc *hccp;
         const char *instructs;
@@ -189,21 +189,20 @@ int tcpudpsvd_main(int argc ATTRIBUTE_UNUSED, char **argv)
 
         tcp = (applet_name[0] == 't');
 
-        /* 3+ args, -i at most once, -p implies -h, -v is counter */
-        opt_complementary = "-3:i--i:ph:vv";
+        /* 3+ args, -i at most once, -p implies -h, -v is counter, -b N, -c N */
+        opt_complementary = "-3:i--i:ph:vv:b+:c+";
 #ifdef SSLSVD
         getopt32(argv, "+c:C:i:x:u:l:Eb:hpt:vU:/:Z:K:",
-                &str_c, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
-                &str_b, &str_t, &ssluser, &root, &cert, &key, &verbose
+                &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
+                &backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
         );
 #else
+        /* "+": stop on first non-option */
         getopt32(argv, "+c:C:i:x:u:l:Eb:hpt:v",
-                &str_c, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
-                &str_b, &str_t, &verbose
+                &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
+                &backlog, &str_t, &verbose
         );
 #endif
-        if (option_mask32 & OPT_c)
-                cmax = xatou_range(str_c, 1, INT_MAX);
         if (option_mask32 & OPT_C) { /* -C n[:message] */
                 max_per_host = bb_strtou(str_C, &str_C, 10);
                 if (str_C[0]) {
@@ -219,8 +218,6 @@ int tcpudpsvd_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 if (!get_uidgid(&ugid, user, 1))
                         bb_error_msg_and_die("unknown user/group: %s", user);
         }
-        if (option_mask32 & OPT_b)
-                backlog = xatou(str_b);
 #ifdef SSLSVD
         if (option_mask32 & OPT_U) ssluser = optarg;
         if (option_mask32 & OPT_slash) root = optarg;