Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b291c7c1 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Harshit Mogalapalli
Browse files

s390/sclp_vt220: Convert newlines to CRLF instead of LFCR 

commit dee3df68ab4b00fff6bdf9fc39541729af37307c upstream.

According to the VT220 specification the possible character combinations
sent on RETURN are only CR or CRLF [0].

	The Return key sends either a CR character (0/13) or a CR
	character (0/13) and an LF character (0/10), depending on the
	set/reset state of line feed/new line mode (LNM).

The sclp/vt220 driver however uses LFCR. This can confuse tools, for
example the kunit runner.

Link: https://vt100.net/docs/vt220-rm/chapter3.html#S3.2


Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: default avatarSven Schnelle <svens@linux.ibm.com>
Link: https://lore.kernel.org/r/20241014-s390-kunit-v1-2-941defa765a6@linutronix.de


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit ce6924fd)
Signed-off-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: default avatarHarshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
parent 70b388b0

drivers/s390/char/sclp_vt220.c

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request, 
	buffer = (void *) ((addr_t) sccb + sccb->header.length);



	if (convertlf) {

		/* Perform Linefeed conversion (0x0a -> 0x0a 0x0d)*/

		/* Perform Linefeed conversion (0x0a -> 0x0d 0x0a)*/

		for (from=0, to=0;

		     (from < count) && (to < sclp_vt220_space_left(request));

		     from++) {
@@ -334,8 +334,8 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request, 
			/* Perform conversion */

			if (c == 0x0a) {

				if (to + 1 < sclp_vt220_space_left(request)) {

					((unsigned char *) buffer)[to++] = c;

					((unsigned char *) buffer)[to++] = 0x0d;

					((unsigned char *) buffer)[to++] = c;

				} else

					break;