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

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a083114c9..4526f0ede 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -188,7 +188,7 @@ static off_t pseudo_offset;
    a multiple of the least common multiple of the sizes associated with
    the specified output types.  It should be as large as possible, but
    no larger than 16 -- unless specified with the -w option.  */
-static size_t bytes_per_block;
+static unsigned bytes_per_block = 32; /* have to use unsigned, not size_t */
 
 /* A NULL-terminated list of the file-arguments from the command line.  */
 static const char *const *file_list;
@@ -1218,7 +1218,6 @@ int od_main(int argc, char **argv)
                 ;
 #endif
         char *str_A, *str_N, *str_j, *str_S;
-        char *str_w = NULL;
         llist_t *lst_t = NULL;
         unsigned opt;
         int l_c_m;
@@ -1239,7 +1238,7 @@ int od_main(int argc, char **argv)
         /* flag_dump_strings = 0; - already is */
 
         /* Parse command line */
-        opt_complementary = "t::"; // list
+        opt_complementary = "w+:t::"; /* -w N, -t is a list */
 #if ENABLE_GETOPT_LONG
         applet_long_options = od_longopts;
 #endif
@@ -1248,7 +1247,7 @@ int od_main(int argc, char **argv)
                 // -S was -s and also had optional parameter
                 // but in coreutils 6.3 it was renamed and now has
                 // _mandatory_ parameter
-                &str_A, &str_N, &str_j, &lst_t, &str_S, &str_w);
+                &str_A, &str_N, &str_j, &lst_t, &str_S, &bytes_per_block);
         argc -= optind;
         argv += optind;
         if (opt & OPT_A) {
@@ -1404,9 +1403,6 @@ int od_main(int argc, char **argv)
         l_c_m = get_lcm();
 
         if (opt & OPT_w) { /* -w: width */
-                bytes_per_block = 32;
-                if (str_w)
-                        bytes_per_block = xatou(str_w);
                 if (!bytes_per_block || bytes_per_block % l_c_m != 0) {
                         bb_error_msg("warning: invalid width %u; using %d instead",
                                         (unsigned)bytes_per_block, l_c_m);