X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ftrim.c;h=d3639154022576cf1b1eec58b29218a9cae00f6c;hb=1cca9484db69971f652dfef48778da0dc56dad12;hp=be97d4924192f4758d3b2884547a12ed91e16d43;hpb=60b2d8d2c8bf9e1bb3f34a3b16b272c2539a6318;p=oweals%2Fbusybox.git

diff --git a/libbb/trim.c b/libbb/trim.c
index be97d4924..d36391540 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -2,27 +2,10 @@
 /*
  * 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.
- *
- * 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
- * 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.
+ * 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.
  */
 
 #include <stdio.h>
@@ -33,21 +16,16 @@
 
 void trim(char *s)
 {
-	int len;
+	size_t len = strlen(s);
+	size_t lws;
 
 	/* trim trailing whitespace */
-	while ( (len=strlen(s)) >= 1 && isspace(s[len-1]))
-		s[len-1]='\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 */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/