2 files changed, 11 insertions, 2 deletions

diff --git a/libbb/dump.c b/libbb/dump.c
index d6e31b9b1..06b73c955 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -724,7 +724,9 @@ void bb_dump_add(const char *fmt)
 
                 /* byte count */
                 if (isdigit(*p)) {
-                        for (savep = p; isdigit(*p); ++p);
+// TODO: use bb_strtou
+                        savep = p;
+                        do p++; while(isdigit(*p));
                         if (!isspace(*p)) {
                                 bb_error_msg_and_die("bad format {%s}", fmt);
                         }
diff --git a/libbb/skip_whitespace.c b/libbb/skip_whitespace.c
index 02c1f5828..bdfb97d70 100644
--- a/libbb/skip_whitespace.c
+++ b/libbb/skip_whitespace.c
@@ -7,12 +7,19 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <ctype.h>
 #include "libbb.h"
 
 char *skip_whitespace(const char *s)
 {
+        /* NB: isspace('0') returns 0 */
         while (isspace(*s)) ++s;
 
         return (char *) s;
 }
+
+char *skip_non_whitespace(const char *s)
+{
+        while (*s && !isspace(*s)) ++s;
+
+        return (char *) s;
+}