From 7f418e3ac0b70f246d5847c2d9697583dbafb6b5 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 23 Jun 2006 02:05:44 -0700
Subject: [PATCH] --- yaml --- r: 29064 b: refs/heads/master c:
 481fad483487ea967fe20bbc9e565d787f7bf20f h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/string.h |  1 +
 trunk/lib/string.c           | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d78be39617ea..66a6623a5efc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fa2164d03fb7af17fcfe4f8800dd754fbd99ff7
+refs/heads/master: 481fad483487ea967fe20bbc9e565d787f7bf20f
diff --git a/trunk/include/linux/string.h b/trunk/include/linux/string.h
index c61306da8c52..e4c755860316 100644
--- a/trunk/include/linux/string.h
+++ b/trunk/include/linux/string.h
@@ -56,6 +56,7 @@ extern char * strnchr(const char *, size_t, int);
 #ifndef __HAVE_ARCH_STRRCHR
 extern char * strrchr(const char *,int);
 #endif
+extern char * strstrip(char *);
 #ifndef __HAVE_ARCH_STRSTR
 extern char * strstr(const char *,const char *);
 #endif
diff --git a/trunk/lib/string.c b/trunk/lib/string.c
index 064f6315b1c3..63077267367e 100644
--- a/trunk/lib/string.c
+++ b/trunk/lib/string.c
@@ -301,6 +301,36 @@ char *strnchr(const char *s, size_t count, int c)
 EXPORT_SYMBOL(strnchr);
 #endif
 
+/**
+ * strstrip - Removes leading and trailing whitespace from @s.
+ * @s: The string to be stripped.
+ *
+ * Note that the first trailing whitespace is replaced with a %NUL-terminator
+ * in the given string @s. Returns a pointer to the first non-whitespace
+ * character in @s.
+ */
+char *strstrip(char *s)
+{
+	size_t size;
+	char *end;
+
+	size = strlen(s);
+
+	if (!size)
+		return s;
+
+	end = s + size - 1;
+	while (end != s && isspace(*end))
+		end--;
+	*(end + 1) = '\0';
+
+	while (*s && isspace(*s))
+		s++;
+
+	return s;
+}
+EXPORT_SYMBOL(strstrip);
+
 #ifndef __HAVE_ARCH_STRLEN
 /**
  * strlen - Find the length of a string