ash: Expand here-documents in the current shell environment

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

diff --git a/libbb/trim.c b/libbb/trim.c
index 75e7c2d43f2c966d25613b9346f3d24974b17113..e360ba138bad0062da4670a4424454d4ab0d91c1 100644 (file)
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -2,48 +2,36 @@
 /*
  * Utility routines.
  *
- * Copyright (C) many different people.  
+ * 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)
+char* FAST_FUNC trim(char *s)
 {
-       int len = strlen(s);
+       size_t len = strlen(s);
+       size_t old = len;
 
        /* 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) {
+               char *nws = skip_whitespace(s);
+               if ((nws - s) != 0) {
+                       len -= (nws - s);
+                       memmove(s, nws, len);
+               }
+       }
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       s += len;
+       /* If it was a "const char*" which does not need trimming,
+        * avoid superfluous store */
+       if (old != len)
+               *s = '\0';
+
+       return s;
+}