[git commit] cttyhack: remove the trailing newline when reading console name from sysfs

Denys Vlasenko vda.linux at googlemail.com
Tue Aug 16 21:29:54 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=816cd16a4ce81ec8d2989a356256f813fc91475d
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/cttyhack.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 4261289..37ea137 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;
 			}
 
-- 
1.7.3.4



More information about the busybox-cvs mailing list