From 271c8ec50f48fae5523f8355b5233fa1db5c6a42 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Oct 2018 16:15:35 +0200
Subject: [PATCH] localectl: FOREACH_LINE excorcism

---
 src/locale/localectl.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 88fd077e09..e2a9415138 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -280,7 +280,6 @@ static int set_x11_keymap(int argc, char **argv, void *userdata) {
 static int list_x11_keymaps(int argc, char **argv, void *userdata) {
         _cleanup_fclose_ FILE *f = NULL;
         _cleanup_strv_free_ char **list = NULL;
-        char line[LINE_MAX];
         enum {
                 NONE,
                 MODELS,
@@ -305,9 +304,16 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
         else
                 assert_not_reached("Wrong parameter");
 
-        FOREACH_LINE(line, f, break) {
+        for (;;) {
+                _cleanup_free_ char *line = NULL;
                 char *l, *w;
 
+                r = read_line(f, LONG_LINE_MAX, &line);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to read keyboard mapping list: %m");
+                if (r == 0)
+                        break;
+
                 l = strstrip(line);
 
                 if (isempty(l))