cttyhack: remove the trailing newline when reading console name from sysfs

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 4261289b45da7b8e58540cf59f40d1ebf1255ffb..37ea13723eef838e32015bf54ce904db03b9b96f 100644 (file)
--- 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;
                        }