systemd/backport-conf-parser-fix-line-number-in-error-message.patch

40 lines
1.2 KiB
Diff

From 68c1ac1568910037a224c301d5c871af73493c16 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 28 Feb 2020 02:37:11 +0900
Subject: [PATCH] conf-parser: fix line number in error message
Fixes #14929.
Conflict:NA
Reference:https://github.com/systemd/systemd/commit/68c1ac1568910037a224c301d5c871af73493c16
---
src/shared/conf-parser.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 318588cc1f..657df0a517 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -334,6 +334,8 @@ int config_parse(const char *unit,
return r;
}
+ line++;
+
l = skip_leading_chars(buf, WHITESPACE);
if (*l != '\0' && strchr(COMMENTS, *l))
continue;
@@ -390,7 +392,7 @@ int config_parse(const char *unit,
r = parse_line(unit,
filename,
- ++line,
+ line,
sections,
lookup,
table,
--
2.27.0