Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 410504c

Browse files
t-8chgregkh
authored andcommittedOct 22, 2024
s390/sclp_vt220: Convert newlines to CRLF instead of LFCR
commit dee3df6 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: 1da177e ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Reviewed-by: Sven Schnelle <svens@linux.ibm.com> Link: https://lore.kernel.org/r/20241014-s390-kunit-v1-2-941defa765a6@linutronix.de Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e2ca8d4 commit 410504c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎drivers/s390/char/sclp_vt220.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
319319
buffer = (void *) ((addr_t) sccb + sccb->header.length);
320320

321321
if (convertlf) {
322-
/* Perform Linefeed conversion (0x0a -> 0x0a 0x0d)*/
322+
/* Perform Linefeed conversion (0x0a -> 0x0d 0x0a)*/
323323
for (from=0, to=0;
324324
(from < count) && (to < sclp_vt220_space_left(request));
325325
from++) {
@@ -328,8 +328,8 @@ sclp_vt220_add_msg(struct sclp_vt220_request *request,
328328
/* Perform conversion */
329329
if (c == 0x0a) {
330330
if (to + 1 < sclp_vt220_space_left(request)) {
331-
((unsigned char *) buffer)[to++] = c;
332331
((unsigned char *) buffer)[to++] = 0x0d;
332+
((unsigned char *) buffer)[to++] = c;
333333
} else
334334
break;
335335

0 commit comments

Comments
 (0)
This repository has been archived.