From: Karel Zak <kzak@redhat.com>
Date: Wed, 19 Dec 2012 09:24:23 +0000 (+0100)
Subject: sulogin: map NL to CR-NL on output in initial termios settings
X-Git-Tag: v2.23-rc1~414
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84ece6980e0ce0e9c86e946083e8cb2790c4d646;p=thirdparty%2Futil-linux.git

sulogin: map NL to CR-NL on output in initial termios settings

(See also 9c62a2326e6e39a5e759830b0b9d91696166fb45 agetty patch).

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 810168de2f..8416e3e0a4 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -114,8 +114,10 @@ static void tcinit(struct console *con)
 		if (!ispeed) ispeed = TTYDEF_SPEED;
 		if (!ospeed) ospeed = TTYDEF_SPEED;
 
-		tio->c_iflag = tio->c_lflag = tio->c_oflag = 0;
 		tio->c_cflag = CREAD | CS8 | HUPCL | (tio->c_cflag & CLOCAL);
+		tio->c_iflag = 0;
+		tio->c_lflag = 0;
+		tio->c_oflag &= OPOST | ONLCR;
 
 		cfsetispeed(tio, ispeed);
 		cfsetospeed(tio, ospeed);