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

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

diff --git a/libbb/trim.c b/libbb/trim.c
index 4957d7276c62244badf144b6198ff60286bf4a06..df00b846e967ce7ce39efabda19a7f13448c09d1 100644 (file)
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -10,18 +10,21 @@
 
 #include "libbb.h"
 
-void trim(char *s)
+void FAST_FUNC trim(char *s)
 {
        size_t len = strlen(s);
-       size_t lws;
 
        /* trim trailing whitespace */
-       while (len && isspace(s[len-1])) --len;
+       while (len && isspace(s[len-1]))
+               --len;
 
        /* trim leading whitespace */
        if (len) {
-               lws = strspn(s, " \n\r\t\v");
-               memmove(s, s + lws, len -= lws);
+               char *nws = skip_whitespace(s);
+               if ((nws - s) != 0) {
+                       len -= (nws - s);
+                       memmove(s, nws, len);
+               }
        }
        s[len] = '\0';
 }