diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-11 22:53:05 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-11 22:53:05 +0100 |
| commit | c89f52ac6938374972253d8752ed65f3af0b3ef4 (patch) | |
| tree | c700addb5615fe76a52c6bf3a5d9a1ea256a6de4 /src/basic/extract-word.c | |
| parent | c129bd5df3ca08eb352cf69d01d2f374552624ae (diff) | |
core: fix dependency parsing
3d793d29059a7ddf5282efa6b32b953c183d7a4d broke parsing of unit file
names that include backslashes, as extract_first_word() strips those.
Fix this, by introducing a new EXTRACT_RETAIN_ESCAPE flag which disables
looking at any flags, thus being compatible with the classic
FOREACH_WORD() behaviour.
Diffstat (limited to 'src/basic/extract-word.c')
| -rw-r--r-- | src/basic/extract-word.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c index ff6d211ef4..fd495692fa 100644 --- a/src/basic/extract-word.c +++ b/src/basic/extract-word.c @@ -128,7 +128,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra } else if (c == quote) { /* found the end quote */ quote = 0; break; - } else if (c == '\\') { + } else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) { backslash = true; break; } else { @@ -146,7 +146,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra else if ((c == '\'' || c == '"') && (flags & EXTRACT_QUOTES)) { quote = c; break; - } else if (c == '\\') { + } else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) { backslash = true; break; } else if (strchr(separators, c)) { |