Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/trim.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/trim.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/libbb/trim.c

@@ -6 +6 @@
  * 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"
 
-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';