From nobody Tue Apr 30 11:15:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512740165676320.7122909081602; Fri, 8 Dec 2017 05:36:05 -0800 (PST) Received: from localhost ([::1]:37284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNIog-0002Co-Md for importer@patchew.org; Fri, 08 Dec 2017 08:35:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNInQ-0001UK-Jz for qemu-devel@nongnu.org; Fri, 08 Dec 2017 08:34:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNInP-00024Y-Mu for qemu-devel@nongnu.org; Fri, 08 Dec 2017 08:34:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eNInJ-000229-K7; Fri, 08 Dec 2017 08:34:25 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0AD5C056789; Fri, 8 Dec 2017 13:34:24 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB957703B7; Fri, 8 Dec 2017 13:34:22 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 13:34:16 +0000 Message-Id: <20171208133416.28978-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 08 Dec 2017 13:34:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] qemu-io: fix EOF Ctrl-D handling in qemu-io readline code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Date: Thu Nov 14 11:54:17 2013 +0100 qemu-io: use readline.c Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- Changed in v2: - Query termios settings for EOF character qemu-io.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/qemu-io.c b/qemu-io.c index c70bde3eb1..fa4972d734 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -10,6 +10,9 @@ #include "qemu/osdep.h" #include #include +#ifndef _WIN32 +#include +#endif =20 #include "qapi/error.h" #include "qemu-io.h" @@ -41,6 +44,26 @@ static bool imageOpts; =20 static ReadLineState *readline_state; =20 +static int ttyEOF; + +static int get_eof_char(void) +{ +#ifdef _WIN32 + return 0x4; /* Ctrl-D */ +#else + struct termios tty; + if (tcgetattr(STDIN_FILENO, &tty) !=3D 0) { + if (errno =3D=3D ENOTTY) { + return 0x0; /* just expect read() =3D=3D 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); @@ -322,7 +345,7 @@ static char *fetchline_readline(void) readline_start(readline_state, get_prompt(), 0, readline_func, &line); while (!line) { int ch =3D getchar(); - if (ch =3D=3D EOF) { + if (ttyEOF !=3D 0x0 && ch =3D=3D ttyEOF) { break; } readline_handle_byte(readline_state, ch); @@ -592,6 +615,7 @@ int main(int argc, char **argv) qemuio_add_command(&close_cmd); =20 if (isatty(STDIN_FILENO)) { + ttyEOF =3D get_eof_char(); readline_state =3D readline_init(readline_printf_func, readline_flush_func, NULL, --=20 2.14.3