diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-13 20:22:53 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-13 20:24:39 -0400 |
| commit | d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc (patch) | |
| tree | 7388d97b95b47d81737025ec0b88f63452a3c6f5 /src/shared | |
| parent | 7914d6bba47a21b98617d04c992a9075ff5af4c0 (diff) | |
fileio: in envfiles, do not skip lines following empty lines
https://bugs.freedesktop.org/show_bug.cgi?id=63477
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/conf-parser.c | 2 | ||||
| -rw-r--r-- | src/shared/install.c | 2 | ||||
| -rw-r--r-- | src/shared/util.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index fbacf986a5..fea2e5624e 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -174,7 +174,7 @@ static int parse_line( if (!*l) return 0; - if (strchr(COMMENTS, *l)) + if (strchr(COMMENTS "\n", *l)) return 0; if (startswith(l, ".include ")) { diff --git a/src/shared/install.c b/src/shared/install.c index f9d223eee6..71e04335ef 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { if (!*l) continue; - if (strchr(COMMENTS, *l)) + if (strchr(COMMENTS "\n", *l)) continue; if (first_word(l, "enable")) { diff --git a/src/shared/util.h b/src/shared/util.h index 99ec0a39bd..ad9753655a 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -52,7 +52,7 @@ union dirent_storage { #define WHITESPACE " \t\n\r" #define NEWLINE "\n\r" #define QUOTES "\"\'" -#define COMMENTS "#;\n" +#define COMMENTS "#;" #define FORMAT_BYTES_MAX 8 |