systemd: merge branch systemd into master

This commit is contained in:
Beniamino Galvani
2019-07-05 09:11:40 +02:00
44 changed files with 1013 additions and 490 deletions

View File

@@ -137,7 +137,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)) {