fix all cases of strcpy on overlapping strings.

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

diff --git a/libbb/skip_whitespace.c b/libbb/skip_whitespace.c
index fd5d725405e23be740c4920c1b8ed93b36a6b9a6..e85f3859faa1e0db3e17a6bff471400fa32d3a50 100644 (file)
--- a/libbb/skip_whitespace.c
+++ b/libbb/skip_whitespace.c
@@ -4,30 +4,22 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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 <ctype.h>
 #include "libbb.h"
 
-const char *bb_skip_whitespace(const char *s)
+char* FAST_FUNC skip_whitespace(const char *s)
+{
+       /* NB: isspace('\0') returns 0 */
+       while (isspace(*s)) ++s;
+
+       return (char *) s;
+}
+
+char* FAST_FUNC skip_non_whitespace(const char *s)
 {
-       while (isspace(*s)) {
-               ++s;
-       }
+       while (*s && !isspace(*s)) ++s;
 
-       return s;
+       return (char *) s;
 }