[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1391116318-17253-2-git-send-email-sebastian.capella@linaro.org>
Date: Thu, 30 Jan 2014 13:11:57 -0800
From: Sebastian Capella <sebastian.capella@...aro.org>
To: linux-kernel@...r.kernel.org, linux-mm@...ck.org,
linux-pm@...r.kernel.org, linaro-kernel@...ts.linaro.org,
patches@...aro.org
Cc: Sebastian Capella <sebastian.capella@...aro.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Joe Perches <joe@...ches.com>,
Mikulas Patocka <mpatocka@...hat.com>,
Michel Lespinasse <walken@...gle.com>,
Shaohua Li <shli@...nel.org>,
Jerome Marchand <jmarchan@...hat.com>,
Joonsoo Kim <iamjoonsoo.kim@....com>
Subject: [PATCH v5 1/2] mm: add kstrimdup function
kstrimdup will duplicate and trim spaces from the passed in
null terminated string. This is useful for strings coming from
sysfs that often include trailing whitespace due to user input.
Signed-off-by: Sebastian Capella <sebastian.capella@...aro.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Joe Perches <joe@...ches.com>
Cc: Mikulas Patocka <mpatocka@...hat.com>
Cc: Rik van Riel <riel@...hat.com> (commit_signer:5/10=50%)
Cc: Michel Lespinasse <walken@...gle.com>
Cc: Shaohua Li <shli@...nel.org>
Cc: Jerome Marchand <jmarchan@...hat.com>
Cc: Mikulas Patocka <mpatocka@...hat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@....com>
---
include/linux/string.h | 1 +
mm/util.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/include/linux/string.h b/include/linux/string.h
index ac889c5..f29f9a0 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -114,6 +114,7 @@ void *memchr_inv(const void *s, int c, size_t n);
extern char *kstrdup(const char *s, gfp_t gfp);
extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
+extern char *kstrimdup(const char *s, gfp_t gfp);
extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
diff --git a/mm/util.c b/mm/util.c
index 808f375..2066b33 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -1,6 +1,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/string.h>
+#include <linux/ctype.h>
#include <linux/export.h>
#include <linux/err.h>
#include <linux/sched.h>
@@ -63,6 +64,35 @@ char *kstrndup(const char *s, size_t max, gfp_t gfp)
EXPORT_SYMBOL(kstrndup);
/**
+ * kstrimdup - Trim and copy a %NUL terminated string.
+ * @s: the string to trim and duplicate
+ * @gfp: the GFP mask used in the kmalloc() call when allocating memory
+ *
+ * Returns an address, which the caller must kfree, containing
+ * a duplicate of the passed string with leading and/or trailing
+ * whitespace (as defined by isspace) removed.
+ */
+char *kstrimdup(const char *s, gfp_t gfp)
+{
+ char *buf;
+ char *begin = skip_spaces(s);
+ size_t len = strlen(begin);
+
+ while (len > 1 && isspace(begin[len - 1]))
+ len--;
+
+ buf = kmalloc_track_caller(len + 1, gfp);
+ if (!buf)
+ return NULL;
+
+ memcpy(buf, begin, len);
+ buf[len] = '\0';
+
+ return buf;
+}
+EXPORT_SYMBOL(kstrimdup);
+
+/**
* kmemdup - duplicate region of memory
*
* @src: memory region to duplicate
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists