dos2unix: tiny shrink

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

diff --git a/libbb/trim.c b/libbb/trim.c
index 8a9b07a14ef43ea1d6f1ec71d606884711a3ae2e..94ccaf7edd097436bfa1895bcf862d746072f30a 100644 (file)
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -2,51 +2,30 @@
 /*
  * 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>
-#include <string.h>
-#include <ctype.h>
 #include "libbb.h"
 
-
 void trim(char *s)
 {
+       size_t len = strlen(s);
+       size_t lws;
+
        /* trim trailing whitespace */
-       while (isspace(s[strlen(s)-1]))
-               s[strlen(s)-1]='\0';
+       while (len && isspace(s[len-1]))
+               --len;
 
        /* trim leading whitespace */
-       memmove(s, &s[strspn(s, " \n\r\t\v")], strlen(s));
-
+       if (len) {
+               lws = strspn(s, " \n\r\t\v");
+               if (lws) {
+                       len -= lws;
+                       memmove(s, s + lws, len);
+               }
+       }
+       s[len] = '\0';
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/