/*
* 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 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;
+ size_t len = strlen(s);
+ size_t old = len;
/* 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) {
+ 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;
+}