[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] osdep: add qemu_set_tty_echo()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 3/5] osdep: add qemu_set_tty_echo() |
Date: |
Thu, 14 Nov 2013 11:54:16 +0100 |
Using stdin with readline.c requires disabling echo and line buffering.
Add a portable wrapper to set the terminal attributes under Linux and
Windows.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
include/qemu/osdep.h | 2 ++
util/oslib-posix.c | 18 ++++++++++++++++++
util/oslib-win32.c | 19 +++++++++++++++++++
3 files changed, 39 insertions(+)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 26136f1..eb5e145 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -215,4 +215,6 @@ bool fips_get_state(void);
*/
char *qemu_get_local_state_pathname(const char *relative_pathname);
+void qemu_set_tty_echo(int fd, bool echo);
+
#endif
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index e00a44c..f5c4016 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -47,6 +47,9 @@ extern int daemon(int, int);
# define QEMU_VMALLOC_ALIGN getpagesize()
#endif
+#include <termios.h>
+#include <unistd.h>
+
#include <glib/gprintf.h>
#include "config-host.h"
@@ -251,3 +254,18 @@ qemu_get_local_state_pathname(const char
*relative_pathname)
return g_strdup_printf("%s/%s", CONFIG_QEMU_LOCALSTATEDIR,
relative_pathname);
}
+
+void qemu_set_tty_echo(int fd, bool echo)
+{
+ struct termios tty;
+
+ tcgetattr(fd, &tty);
+
+ if (echo) {
+ tty.c_lflag |= ECHO | ECHONL | ICANON | IEXTEN;
+ } else {
+ tty.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN);
+ }
+
+ tcsetattr(fd, TCSANOW, &tty);
+}
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 776ccfa..50be044 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -189,3 +189,22 @@ qemu_get_local_state_pathname(const char
*relative_pathname)
return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", base_path,
relative_pathname);
}
+
+void qemu_set_tty_echo(int fd, bool echo)
+{
+ HANDLE handle = (HANDLE)_get_osfhandle(fd);
+ DWORD dwMode = 0;
+
+ if (handle == INVALID_HANDLE_VALUE) {
+ return;
+ }
+
+ GetConsoleMode(handle, &dwMode);
+
+ if (echo) {
+ SetConsoleMode(handle, dwMode | ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT);
+ } else {
+ SetConsoleMode(handle,
+ dwMode & ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT));
+ }
+}
--
1.8.3.1
- [Qemu-devel] [PATCH 0/5] qemu-io: readline command completion, Stefan Hajnoczi, 2013/11/14
- [Qemu-devel] [PATCH 1/5] readline: decouple readline from the monitor, Stefan Hajnoczi, 2013/11/14
- [Qemu-devel] [PATCH 3/5] osdep: add qemu_set_tty_echo(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 2/5] readline: move readline to a generic location, Stefan Hajnoczi, 2013/11/14
- [Qemu-devel] [PATCH 4/5] qemu-io: use readline.c, Stefan Hajnoczi, 2013/11/14
- [Qemu-devel] [PATCH 5/5] qemu-io: add command completion, Stefan Hajnoczi, 2013/11/14
- Re: [Qemu-devel] [PATCH 0/5] qemu-io: readline command completion, Luiz Capitulino, 2013/11/27