X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ftrim.c;h=16cb4fbb07f256794e1047041d710d3b923dd816;hb=9be4702a304863095d20181b5632ee7e0a4acdc4;hp=0dca6678edf758985ae62e1a496e3ddfba39cca5;hpb=828548ab56ed2dca36daf0dfdbb0644119ecbe2c;p=oweals%2Fbusybox.git

diff --git a/libbb/trim.c b/libbb/trim.c
index 0dca6678e..16cb4fbb0 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -5,49 +5,26 @@
  * 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 source tree.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
 #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);
+	if (len) {
+		char *nws = skip_whitespace(s);
+		if ((nws - s) != 0) {
+			len -= (nws - s);
+			memmove(s, nws, len);
+		}
 	}
-	s[len] = 0;
+	s[len] = '\0';
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/