diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-06-23 18:20:53 +0200 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-08-07 17:50:42 +0200 |
| commit | 6868560773ada8ea31d1f86422be6bf026a1f660 (patch) | |
| tree | a8d97674f235783d9e6b424f213433f5d3eb647a /src/tmpfiles/tmpfiles.c | |
| parent | unquote_first_word: set *p=NULL on termination (diff) | |
| download | systemd-6868560773ada8ea31d1f86422be6bf026a1f660.tar.xz systemd-6868560773ada8ea31d1f86422be6bf026a1f660.zip | |
util: change unquote_*_word to extract_*_word
It now takes a separators argument, which defaults to WHITESPACE if NULL
is passed.
Diffstat (limited to '')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index d6f7801561..d73138900d 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 = unquote_first_word(&p, &xattr, UNQUOTE_CUNESCAPE); + r = extract_first_word(&p, &xattr, NULL, EXTRACT_CUNESCAPE); if (r < 0) log_warning_errno(r, "Failed to parse extended attribute '%s', ignoring: %m", p); if (r <= 0) @@ -1760,8 +1760,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { assert(line >= 1); assert(buffer); - r = unquote_many_words( + r = extract_many_words( &buffer, + NULL, 0, &action, &path, |