diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-16 21:32:03 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-16 21:32:03 +0200 |
| commit | 0038aed166da0ae991f13cf512b84ac8f77d22ae (patch) | |
| tree | e949a1977a563e44763d6000c1467ef4726705cf /src/tmpfiles/tmpfiles.c | |
| parent | d1584b9f5b8ba7857ee8f287c87a78da74ec30fe (diff) | |
| parent | 2eadf91ca15a982adf71b86e6ee035ac368e74bc (diff) | |
Merge pull request #908 from richardmaw-codethink/nspawn-path-escapes-v3
Allow arbitrary file paths to be passed to nspawn (v3)
Diffstat (limited to 'src/tmpfiles/tmpfiles.c')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index d6f7801561..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 = unquote_first_word(&p, &xattr, UNQUOTE_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) @@ -1760,9 +1760,10 @@ 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, - 0, + NULL, + EXTRACT_QUOTES, &action, &path, &mode, |