Fixes so "make allnoconfig" works again.

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

diff --git a/libbb/trim.c b/libbb/trim.c
index 78cf235dd006cae01c326006d69e2d79e24f3e18..0dca6678edf758985ae62e1a496e3ddfba39cca5 100644 (file)
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -2,27 +2,23 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) many different people.
+ * If you wrote this, please acknowledge your work.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
  */
 
 #include <stdio.h>
@@ -33,14 +29,18 @@
 
 void trim(char *s)
 {
-       int len=strlen(s);
+       size_t len = strlen(s);
+       size_t lws;
 
        /* trim trailing whitespace */
-       while ( len > 0 && isspace(s[len-1]))
-               s[--len]='\0';
+       while (len && isspace(s[len-1])) --len;
 
        /* trim leading whitespace */
-       memmove(s, &s[strspn(s, " \n\r\t\v")], len);
+       if(len) {
+               lws = strspn(s, " \n\r\t\v");
+               memmove(s, s + lws, len -= lws);
+       }
+       s[len] = 0;
 }
 
 /* END CODE */