diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-23 16:26:49 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-08-07 15:50:42 +0000 |
| commit | 12ba2c44dde4d7cfc0e531dbc3cbd0581c323637 (patch) | |
| tree | 181b657b7857a5c460ada046a6f59143ba5e250a /src/tmpfiles | |
| parent | 6868560773ada8ea31d1f86422be6bf026a1f660 (diff) | |
util: Don't interpret quotes by default in extract_first_word
This adds an EXTRACT_QUOTES option to allow the previous behaviour, of
not interpreting any character inside ' or " quotes as separators.
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index d73138900d..8f29256c6d 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -662,7 +662,7 @@ static int parse_xattrs_from_arg(Item *i) { for (;;) { _cleanup_free_ char *name = NULL, *value = NULL, *xattr = NULL, *xattr_replaced = NULL; - r = extract_first_word(&p, &xattr, NULL, EXTRACT_CUNESCAPE); + r = extract_first_word(&p, &xattr, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE); if (r < 0) log_warning_errno(r, "Failed to parse extended attribute '%s', ignoring: %m", p); if (r <= 0) @@ -1763,7 +1763,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { r = extract_many_words( &buffer, NULL, - 0, + EXTRACT_QUOTES, &action, &path, &mode, |