lineedit: in !EDITING config, return -1 on fgets error

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

diff --git a/libbb/trim.c b/libbb/trim.c
index ea20ff370396155610fb24bdafa1d0196ba386f0..16cb4fbb07f256794e1047041d710d3b923dd816 100644 (file)
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -5,7 +5,7 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -13,7 +13,6 @@
 void FAST_FUNC trim(char *s)
 {
        size_t len = strlen(s);
-       size_t lws;
 
        /* trim trailing whitespace */
        while (len && isspace(s[len-1]))
@@ -21,10 +20,10 @@ void FAST_FUNC trim(char *s)
 
        /* trim leading whitespace */
        if (len) {
-               lws = strspn(s, " \n\r\t\v");
-               if (lws) {
-                       len -= lws;
-                       memmove(s, s + lws, len);
+               char *nws = skip_whitespace(s);
+               if ((nws - s) != 0) {
+                       len -= (nws - s);
+                       memmove(s, nws, len);
                }
        }
        s[len] = '\0';