Fix issue with messed up linewrap in qemu-system-x86_64

troglobit · troglobit · commit 7850378e15cf · 2023-05-15T16:05:59.000+02:00
Apparently the qemu-system-x86_64 in -nographics mode does all sorts of
crazy things to the terminal.  Most annoying, it disables linewrap.

Signed-off-by: Joachim Wiberg &lt;troglobit@gmail.com&gt;
diff --git a/src/helpers.c b/src/helpers.c
@@ -84,6 +84,9 @@ char *console(void)
 
 void console_init(void)
 {
+	/* Enable line wrap, if disabled previously, e.g., qemu */
+	dprint(STDOUT_FILENO, "\033[?7h", 5);
+
 	log_init();
 }
 
diff --git a/src/stty.c b/src/stty.c
@@ -132,7 +132,7 @@ void stty(int fd, speed_t speed)
 	dprint(fd, "\033[?25h", 6);
 
 	/* Enable line wrap, if disabled previously */
-	dprint(fd, "\033[7h", 4);
+	dprint(fd, "\033[?7h", 5);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ char *console(void)`
`84`	`84`
`85`	`85`	`void console_init(void)`
`86`	`86`	`{`
	`87`	`+ /* Enable line wrap, if disabled previously, e.g., qemu */`
	`88`	`+ dprint(STDOUT_FILENO, "\033[?7h", 5);`
	`89`	`+`
`87`	`90`	`log_init();`
`88`	`91`	`}`
`89`	`92`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void stty(int fd, speed_t speed)`
`132`	`132`	`dprint(fd, "\033[?25h", 6);`
`133`	`133`
`134`	`134`	`/* Enable line wrap, if disabled previously */`
`135`		`- dprint(fd, "\033[7h", 4);`
	`135`	`+ dprint(fd, "\033[?7h", 5);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/**`