Skip to contentSkip to conversation

qemu-io: fix EOF Ctrl-D handling in qemu-io readline code

PATCH Applied Daniel P. Berrangé 3 participants 3 messages Feb 12, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 qemu-io: fix EOF Ctrl-D handling in qemu-io readline code

From: "Daniel P. Berrange" <[email protected]>

qemu-io puts the TTY into non-canonical mode, which means no EOF processing is done and thus getchar() will never return the EOF constant. Instead we have to query the TTY attributes to determine the configured EOF character (usually Ctrl-D / 0x4), and then explicitly check for that value. This fixes the regression that prevented Ctrl-D from triggering an exit of qemu-io that has existed since readline was first added in

commit 0cf17e181798063c3824c8200ba46f25f54faa1a
Author: Stefan Hajnoczi <[email protected]>
Date: Thu Nov 14 11:54:17 2013 +0100

qemu-io: use readline.c

It also ensures that a newline is printed when exiting, to complete the line output by the "qemu-io> " prompt.

---

Changed in v3:

- print newline when exiting

 qemu-io.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)
qemu-io.c +26 -1
index f554ab614b..2c00ea068e 100644
@@ -11,6 +11,9 @@
 #include "qemu/osdep.h"
 #include <getopt.h>
 #include <libgen.h>
+#ifndef _WIN32
+#include <termios.h>
+#endif
 
 #include "qapi/error.h"
 #include "qemu-io.h"
@@ -42,6 +45,26 @@ static bool imageOpts;
 
 static ReadLineState *readline_state;
 
+static int ttyEOF;
+
+static int get_eof_char(void)
+{
+#ifdef _WIN32
+    return 0x4; /* Ctrl-D */
+#else
+    struct termios tty;
+    if (tcgetattr(STDIN_FILENO, &tty) != 0) {
+        if (errno == ENOTTY) {
+            return 0x0; /* just expect read() == 0 */
+        } else {
+            return 0x4; /* Ctrl-D */
+        }
+    }
+
+    return tty.c_cc[VEOF];
+#endif
+}
+
 static int close_f(BlockBackend *blk, int argc, char **argv)
 {
     blk_unref(qemuio_blk);
@@ -323,7 +346,8 @@ static char *fetchline_readline(void)
     readline_start(readline_state, get_prompt(), 0, readline_func, &line);
     while (!line) {
         int ch = getchar();
-        if (ch == EOF) {
+        if (ttyEOF != 0x0 && ch == ttyEOF) {
+            printf("\n");
             break;
         }
         readline_handle_byte(readline_state, ch);
@@ -593,6 +617,7 @@ int main(int argc, char **argv)
     qemuio_add_command(&close_cmd);
 
     if (isatty(STDIN_FILENO)) {
+        ttyEOF = get_eof_char();
         readline_state = readline_init(readline_printf_func,
                                        readline_flush_func,
                                        NULL,
Signature · 1 line
2.14.3
Applied
#1 lore raw

Am 12.02.2018 um 19:48 hat Daniel P. Berrangé geschrieben:

Quoted 13 lines

From: "Daniel P. Berrange" <[email protected]>

qemu-io puts the TTY into non-canonical mode, which means no EOF processing is done and thus getchar() will never return the EOF constant. Instead we have to query the TTY attributes to determine the configured EOF character (usually Ctrl-D / 0x4), and then explicitly check for that value. This fixes the regression that prevented Ctrl-D from triggering an exit of qemu-io that has existed since readline was first added in

commit 0cf17e181798063c3824c8200ba46f25f54faa1a
Author: Stefan Hajnoczi <[email protected]>
Date: Thu Nov 14 11:54:17 2013 +0100

Quoted 6 lines

qemu-io: use readline.c

It also ensures that a newline is printed when exiting, to complete the line output by the "qemu-io> " prompt.

Thanks, applied to the block branch.

Kevin

Reviewed-by on v3 1/1
#2 lore raw
In reply to Daniel P. Berrangé
Quoted 13 lines · Daniel P. Berrangé

From: "Daniel P. Berrange" <[email protected]>

qemu-io puts the TTY into non-canonical mode, which means no EOF processing is done and thus getchar() will never return the EOF constant. Instead we have to query the TTY attributes to determine the configured EOF character (usually Ctrl-D / 0x4), and then explicitly check for that value. This fixes the regression that prevented Ctrl-D from triggering an exit of qemu-io that has existed since readline was first added in

commit 0cf17e181798063c3824c8200ba46f25f54faa1a
Author: Stefan Hajnoczi <[email protected]>
Date: Thu Nov 14 11:54:17 2013 +0100

Quoted 7 lines

qemu-io: use readline.c

It also ensures that a newline is printed when exiting, to complete the line output by the "qemu-io> " prompt.

---

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org