X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ftrim.c;h=d3639154022576cf1b1eec58b29218a9cae00f6c;hb=d3d004dd3507f841745956a035fff68936378f9c;hp=38aa28231b4e4609a0e7081150445cf25abbb8d0;hpb=c7bda1ce659294d6e22c06e087f6f265983c7578;p=oweals%2Fbusybox.git

diff --git a/libbb/trim.c b/libbb/trim.c
index 38aa28231..d36391540 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -5,20 +5,7 @@
  * 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
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -29,21 +16,16 @@
 
 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 */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/