From: Tony Asleson <tasleson@redhat.com>
To: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [RFC 1/9] lib/string: Add function to trim duplicate WS
Date: Mon, 23 Dec 2019 16:55:50 -0600 [thread overview]
Message-ID: <20191223225558.19242-2-tasleson@redhat.com> (raw)
In-Reply-To: <20191223225558.19242-1-tasleson@redhat.com>
Adds function strim_dupe which trims leading & trailing whitespace and
duplicate adjacent. Initial use case is to shorten T10 storage IDs.
Signed-off-by: Tony Asleson <tasleson@redhat.com>
---
include/linux/string.h | 2 ++
lib/string.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/include/linux/string.h b/include/linux/string.h
index b6ccdc2c7f02..bcca6bfab6ab 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -72,6 +72,8 @@ extern char * __must_check skip_spaces(const char *);
extern char *strim(char *);
+extern size_t strim_dupe(char *s);
+
static inline __must_check char *strstrip(char *str)
{
return strim(str);
diff --git a/lib/string.c b/lib/string.c
index 08ec58cc673b..1186cce1f66b 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -515,6 +515,41 @@ char *strim(char *s)
}
EXPORT_SYMBOL(strim);
+/**
+ * Removes leading and trailing whitespace and removes duplicate
+ * adjacent whitespace in a string, modifies string in place.
+ * @s The %NUL-terminated string to have spaces removed
+ * Returns the new length
+ */
+size_t strim_dupe(char *s)
+{
+ size_t ret = 0;
+ char *w = s;
+ char *p;
+
+ /*
+ * This will remove all leading and duplicate adjacent, but leave
+ * 1 space at the end if one or more are present.
+ */
+ for (p = s; *p != '\0'; ++p) {
+ if (!isspace(*p) || (p != s && !isspace(*(p - 1)))) {
+ *w = *p;
+ ++w;
+ ret += 1;
+ }
+ }
+
+ *w = '\0';
+
+ /* Take off the last character if it's a space too */
+ if (ret && isspace(*(w - 1))) {
+ ret--;
+ *(w - 1) = '\0';
+ }
+ return ret;
+}
+EXPORT_SYMBOL(strim_dupe);
+
#ifndef __HAVE_ARCH_STRLEN
/**
* strlen - Find the length of a string
--
2.21.0
next prev parent reply other threads:[~2019-12-23 22:56 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 22:55 [RFC 0/9] Add persistent durable identifier to storage log messages Tony Asleson
2019-12-23 22:55 ` Tony Asleson [this message]
2019-12-23 23:28 ` [RFC 1/9] lib/string: Add function to trim duplicate WS Matthew Wilcox
2020-01-02 22:52 ` Tony Asleson
2020-01-03 14:30 ` Tony Asleson
2019-12-23 22:55 ` [RFC 2/9] printk: Bring back printk_emit Tony Asleson
2019-12-23 22:55 ` [RFC 3/9] printk: Add printk_emit_ratelimited macro Tony Asleson
2019-12-23 22:55 ` [RFC 4/9] struct device_type: Add function callback durable_name Tony Asleson
2019-12-23 22:55 ` [RFC 5/9] block: Add support functions for persistent durable name Tony Asleson
2019-12-23 22:55 ` [RFC 6/9] create_syslog_header: Add " Tony Asleson
2019-12-24 0:54 ` James Bottomley
2020-01-02 22:53 ` Tony Asleson
2019-12-23 22:55 ` [RFC 7/9] print_req_error: Add persistent " Tony Asleson
2019-12-23 22:55 ` [RFC 8/9] ata_dev_printk: Add durable name to output Tony Asleson
2019-12-24 0:56 ` James Bottomley
2019-12-23 22:55 ` [RFC 9/9] __xfs_printk: " Tony Asleson
2020-01-04 2:56 ` Dave Chinner
2020-01-06 2:45 ` Tony Asleson
2020-01-06 22:02 ` Dave Chinner
2020-01-07 0:19 ` Sweet Tea Dorminy
2020-01-07 1:23 ` Dave Chinner
2020-01-07 17:01 ` Tony Asleson
2020-01-08 2:10 ` Dave Chinner
2020-01-08 16:53 ` Tony Asleson
2020-01-09 1:41 ` Alasdair G Kergon
2020-01-09 23:22 ` Dave Chinner
2020-01-10 1:28 ` Alasdair G Kergon
2020-01-10 16:13 ` Tony Asleson
2019-12-24 0:50 ` [RFC 0/9] Add persistent durable identifier to storage log messages James Bottomley
2020-01-02 22:52 ` Tony Asleson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191223225558.19242-2-tasleson@redhat.com \
--to=tasleson@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).