diff options
| author | David Bremner <david@tethera.net> | 2021-09-30 14:17:48 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-04 12:16:12 -0400 |
| commit | bab633d3ac87167dc214094f9d340655885a01b1 (patch) | |
| tree | 7c34ed13cdbecbb7c2ade6e5009b16870bf93f4e /util/string-util.c | |
| parent | e22bbb124e4f9191880e80d6517346f35bf7e2a9 (diff) | |
config: ignore leading/trailing spaces in ';'-delimited lists
In [1] Ciprian observed that it was easy for users to mistakenly
introduce leading and trailing space to new.tags when editing a
notmuch config file. This commit strips spaces on either side of the
';' delimiter when splitting.
In principle it would be possible to support tags (or other config
values) with leading or trailing spaces by processing '\s' escapes in
the input string. Currently such processing is not done.
[1]: id:CA+Tk8fzjPLaEd3vL1f9ebk_bF_RV8PDTLzDupraTkCLCpJAmCg@mail.gmail.com
Diffstat (limited to 'util/string-util.c')
| -rw-r--r-- | util/string-util.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/util/string-util.c b/util/string-util.c index 9c46a81a..03d7648d 100644 --- a/util/string-util.c +++ b/util/string-util.c @@ -42,13 +42,15 @@ const char * strsplit_len (const char *s, char delim, size_t *len) { bool escaping = false; - size_t count = 0; + size_t count = 0, last_nonspace = 0; - /* Skip initial unescaped delimiters */ - while (*s && *s == delim) + /* Skip initial unescaped delimiters and whitespace */ + while (*s && (*s == delim || isspace (*s))) s++; while (s[count] && (escaping || s[count] != delim)) { + if (! isspace (s[count])) + last_nonspace = count; escaping = (s[count] == '\\'); count++; } @@ -56,7 +58,7 @@ strsplit_len (const char *s, char delim, size_t *len) if (count == 0) return NULL; - *len = count; + *len = last_nonspace + 1; return s; } |