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

diff --git a/networking/tftp.c b/networking/tftp.c
index 14c340b22..187261568 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -397,9 +397,6 @@ int tftp_main(int argc ATTRIBUTE_UNUSED, char **argv)
         len_and_sockaddr *peer_lsa;
         const char *localfile = NULL;
         const char *remotefile = NULL;
-#if ENABLE_FEATURE_TFTP_BLOCKSIZE
-        const char *sblocksize = NULL;
-#endif
         int port;
         USE_GETPUT(int cmd;)
         int fd = -1;
@@ -409,13 +406,14 @@ int tftp_main(int argc ATTRIBUTE_UNUSED, char **argv)
 
         /* -p or -g is mandatory, and they are mutually exclusive */
         opt_complementary = "" USE_FEATURE_TFTP_GET("g:") USE_FEATURE_TFTP_PUT("p:")
-                        USE_GETPUT("?g--p:p--g");
+                        USE_GETPUT("g--p:p--g:")
+                        USE_FEATURE_TFTP_BLOCKSIZE("b+");
 
         USE_GETPUT(cmd =) getopt32(argv,
                         USE_FEATURE_TFTP_GET("g") USE_FEATURE_TFTP_PUT("p")
                                 "l:r:" USE_FEATURE_TFTP_BLOCKSIZE("b:"),
                         &localfile, &remotefile
-                        USE_FEATURE_TFTP_BLOCKSIZE(, &sblocksize));
+                        USE_FEATURE_TFTP_BLOCKSIZE(, &blocksize));
         argv += optind;
 
         flags = O_RDONLY;
@@ -423,12 +421,8 @@ int tftp_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 flags = O_WRONLY | O_CREAT | O_TRUNC;
 
 #if ENABLE_FEATURE_TFTP_BLOCKSIZE
-        if (sblocksize) {
-                blocksize = xatoi_u(sblocksize);
-                if (!tftp_blocksize_check(blocksize, 0)) {
-                        return EXIT_FAILURE;
-                }
-        }
+        if (!tftp_blocksize_check(blocksize, 0))
+                return EXIT_FAILURE;
 #endif
 
         if (!localfile)