diff options
| author | Michael Biebl <biebl@debian.org> | 2019-07-31 10:52:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-07-31 10:52:41 +0200 |
| commit | 3a99ba5fd066fe42bd5461360a7411766496619c (patch) | |
| tree | b43863fbe867d7b0f9f9032fd40664c521c88fcb /shared/systemd/src/basic/extract-word.c | |
| parent | 13cfe714153013158bdf3e74ab58ab713a04223c (diff) | |
| parent | 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (diff) | |
Update upstream source from tag 'upstream/1.19.90'
Update to upstream version '1.19.90' with Debian dir 6d1a5b9902866beee1365904d425141b5d4c944c
Diffstat (limited to 'shared/systemd/src/basic/extract-word.c')
| -rw-r--r-- | shared/systemd/src/basic/extract-word.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shared/systemd/src/basic/extract-word.c b/shared/systemd/src/basic/extract-word.c index 782c868b..15cbaafb 100644 --- a/shared/systemd/src/basic/extract-word.c +++ b/shared/systemd/src/basic/extract-word.c @@ -30,6 +30,8 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra assert(p); assert(ret); + /* Those two don't make sense together. */ + assert(!FLAGS_SET(flags, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE)); /* Bail early if called after last value or with no input */ if (!*p) @@ -137,7 +139,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra for (;; (*p)++, c = **p) { if (c == 0) goto finish_force_terminate; - else if (IN_SET(c, '\'', '"') && (flags & EXTRACT_QUOTES)) { + else if (IN_SET(c, '\'', '"') && (flags & EXTRACT_UNQUOTE)) { quote = c; break; } else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) { |