Merge branch 'busybox' into merge

2 files changed, 11 insertions, 12 deletions

diff --git a/libbb/dump.c b/libbb/dump.c
index ffc46f6a7..aa57eca8c 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -204,9 +204,11 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs)
                                 if (!e)
                                         goto DO_BAD_CONV_CHAR;
                                 pr->flags = F_INT;
-                                if (e > int_convs + 1) /* not d or i? */
-                                        pr->flags = F_UINT;
                                 byte_count_str = "\010\004\002\001";
+                                if (e > int_convs + 1) { /* not d or i? */
+                                        pr->flags = F_UINT;
+                                        byte_count_str++;
+                                }
                                 goto DO_BYTE_COUNT;
                         } else
                         if (strchr(int_convs, *p1)) { /* %d etc */
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 56040e150..76d29d5eb 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -93,7 +93,7 @@ getopt32(char **argv, const char *applet_opts, ...)
 
  "!"    If the first character in the applet_opts string is a '!',
         report bad options, missing required options,
-        inconsistent options with all-ones return value (instead of abort.
+        inconsistent options with all-ones return value instead of aborting.
 
  "+"    If the first character in the applet_opts string is a plus,
         then option processing will stop as soon as a non-option is
@@ -265,7 +265,7 @@ Special characters:
         for "long options only" cases, such as tar --exclude=PATTERN,
         wget --header=HDR cases.
 
- "a?b"  A "?" between an option and a group of options means that
+ "a?bc" A "?" between an option and a group of options means that
         at least one of them is required to occur if the first option
         occurs in preceding command line arguments.
 
@@ -348,9 +348,6 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
         unsigned trigger;
         int min_arg = 0;
         int max_arg = -1;
-        int spec_flgs = 0;
-
-#define SHOW_USAGE_IF_ERROR     1
 
         on_off = complementary;
         memset(on_off, 0, sizeof(complementary));
@@ -449,9 +446,7 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
                         continue;
                 c = s[1];
                 if (*s == '?') {
-                        if (c < '0' || c > '9') {
-                                spec_flgs |= SHOW_USAGE_IF_ERROR;
-                        } else {
+                        if (c >= '0' && c <= '9') {
                                 max_arg = c - '0';
                                 s++;
                         }
@@ -465,8 +460,10 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
                         continue;
                 }
                 if (*s == '=') {
-                        min_arg = max_arg = c - '0';
-                        s++;
+                        if (c >= '0' && c <= '9') {
+                                min_arg = max_arg = c - '0';
+                                s++;
+                        }
                         continue;
                 }
                 for (on_off = complementary; on_off->opt_char; on_off++)