From c3341ffd2f06fadeca07b74279070c334b8d8cc1 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 7 Jan 2016 23:47:01 +0200 Subject: [PATCH] menu: fix input config for device names ending with space reported by KP142EH12 and perhaps somebody else I forgot also take the opportunity to update libpicofe --- frontend/libpicofe | 2 +- frontend/menu.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/libpicofe b/frontend/libpicofe index 26ea1817..21604a04 160000 --- a/frontend/libpicofe +++ b/frontend/libpicofe @@ -1 +1 @@ -Subproject commit 26ea18173c1228dd5ce39e2a88ffe1ae10fcb365 +Subproject commit 21604a047941b8fe81d381ede0371c75da964afd diff --git a/frontend/menu.c b/frontend/menu.c index 0088a632..9ddbe376 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -903,8 +903,6 @@ static void get_line(char *d, size_t size, const char *s) len = size - 1; strncpy(d, s, len); d[len] = 0; - - mystrip(d); } static void keys_write_all(FILE *f) @@ -1011,7 +1009,10 @@ static void keys_load_all(const char *cfg) while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) { p += 10; + // don't strip 'dev' because there are weird devices + // with names with space at the end get_line(dev, sizeof(dev), p); + dev_id = in_config_parse_dev(dev); if (dev_id < 0) { printf("input: can't handle dev: %s\n", dev); -- 2.39.5