traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / libbb / skip_whitespace.c

diff --git a/libbb/skip_whitespace.c b/libbb/skip_whitespace.c
index 02c1f5828897a42c6def21c97d054a26cabb3a0e..7b123261b1a7d6ad05196258e6f2ca3fa2f742c9 100644 (file)
--- a/libbb/skip_whitespace.c
+++ b/libbb/skip_whitespace.c
@@ -7,12 +7,26 @@
  * 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)
+char* FAST_FUNC skip_whitespace(const char *s)
 {
-       while (isspace(*s)) ++s;
+       /* In POSIX/C locale (the only locale we care about: do we REALLY want
+        * to allow Unicode whitespace in, say, .conf files? nuts!)
+        * isspace is only these chars: "\t\n\v\f\r" and space.
+        * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13.
+        * Use that.
+        */
+       while (*s == ' ' || (unsigned char)(*s - 9) <= (13 - 9))
+               s++;
+
+       return (char *) s;
+}
+
+char* FAST_FUNC skip_non_whitespace(const char *s)
+{
+       while (*s != '\0' && *s != ' ' && (unsigned char)(*s - 9) > (13 - 9))
+               s++;
 
        return (char *) s;
 }