From patchwork Fri Jan 31 00:54:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 3559921 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5B9639F382 for ; Fri, 31 Jan 2014 00:55:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8C877201CD for ; Fri, 31 Jan 2014 00:55:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DB33201D3 for ; Fri, 31 Jan 2014 00:55:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932191AbaAaAyz (ORCPT ); Thu, 30 Jan 2014 19:54:55 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]:40540 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753985AbaAaAyX (ORCPT ); Thu, 30 Jan 2014 19:54:23 -0500 Received: by mail-pd0-f181.google.com with SMTP id y10so3653387pdj.26 for ; Thu, 30 Jan 2014 16:54:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QX6fvDTWFWvJyPZZU1IteHsPQ2bRQW1V3aOmuc8Fh9I=; b=Ok9nThiEsyOIXzlM7GlfVrzdvbhY3WW+lFWCQR5JYaW+/UASBSN5Zsv2BK7m+gHYgL 9943/+Bd2k5WCbA2QDAKuBS668TZhvOMfkxgEK3NYdHGjtQO8o2Pg98X88b3Jmvx7Cf1 o0C4hf+xA5JqXZ0tW9wBNtKoNMT9hSD5lvqxXByH7h8V3eGLDJmTjtCmgICFlDDmbu3d BJah9cz4n4N2v0H8x57EWNQDd+wl7lpOgEnbvo00m9444R6zzyqJwE8tGcV1lEqfwwdR Kys/zYhle8ChneBPuJb1x1QfN0Ny6U/BQOac+6Ynyi+NbJAIGfvg/mnH2o9JKkNx/j4z rqtg== X-Gm-Message-State: ALoCoQn+roKUn3oxgZKpHkfBtoJWdwIvst7AbgMzz4nOS2bouglnPbkHNh+Abn3yeN0utG+FlCPJ X-Received: by 10.67.3.97 with SMTP id bv1mr17775950pad.54.1391129662950; Thu, 30 Jan 2014 16:54:22 -0800 (PST) Received: from localhost (cpe-76-93-135-111.san.res.rr.com. [76.93.135.111]) by mx.google.com with ESMTPSA id xn12sm53562728pac.12.2014.01.30.16.54.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 30 Jan 2014 16:54:21 -0800 (PST) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, patches@linaro.org Cc: Sebastian Capella , Andrew Morton , Joe Perches , Mikulas Patocka , David Rientjes , Michel Lespinasse , Shaohua Li , Jerome Marchand , Joonsoo Kim Subject: [PATCH v6 1/2] mm: add kstrimdup function Date: Thu, 30 Jan 2014 16:54:13 -0800 Message-Id: <1391129654-12854-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391129654-12854-1-git-send-email-sebastian.capella@linaro.org> References: <1391129654-12854-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kstrimdup creates a whitespace-trimmed duplicate of the passed in null-terminated string. This is useful for strings coming from sysfs that often include trailing whitespace due to user input. Thanks to Joe Perches for this implementation. Signed-off-by: Sebastian Capella Cc: Andrew Morton Cc: Joe Perches Cc: Mikulas Patocka Cc: David Rientjes Cc: Rik van Riel (commit_signer:5/10=50%) Cc: Michel Lespinasse Cc: Shaohua Li Cc: Jerome Marchand Cc: Mikulas Patocka Cc: Joonsoo Kim Acked-by: David Rientjes --- 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..a8b731c 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -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 && 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