From 816cd16a4ce81ec8d2989a356256f813fc91475d Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Wed, 13 Jul 2011 09:29:55 -0700 Subject: [PATCH] cttyhack: remove the trailing newline when reading console name from sysfs Signed-off-by: Kevin Cernekee Signed-off-by: Denys Vlasenko --- shell/cttyhack.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shell/cttyhack.c b/shell/cttyhack.c index 4261289b4..37ea13723 100644 --- a/shell/cttyhack.c +++ b/shell/cttyhack.c @@ -122,10 +122,12 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv) do { #ifdef __linux__ int s = open_read_close("/sys/class/tty/console/active", - console + 5, sizeof(console) - 5 - 1); + console + 5, sizeof(console) - 5); if (s > 0) { - /* found active console via sysfs (Linux 2.6.38+) */ - console[5 + s] = '\0'; + /* found active console via sysfs (Linux 2.6.38+) + * sysfs string looks like "ttyS0\n" so zap the newline: + */ + console[4 + s] = '\0'; break; } -- 2.25.1