From nobody Sat May 4 15:28:09 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 151256153593921.454091778280485; Wed, 6 Dec 2017 03:58:55 -0800 (PST) Received: from localhost ([::1]:55090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMYLa-0002DG-Af for importer@patchew.org; Wed, 06 Dec 2017 06:58:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMYKl-0001PV-2a for qemu-devel@nongnu.org; Wed, 06 Dec 2017 06:57:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMYKk-0000tJ-8Y for qemu-devel@nongnu.org; Wed, 06 Dec 2017 06:57:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eMYKd-0000mQ-Tn; Wed, 06 Dec 2017 06:57:44 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EBCE4E90F; Wed, 6 Dec 2017 11:57:41 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBC5D7A214; Wed, 6 Dec 2017 11:57:36 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Wed, 6 Dec 2017 11:57:26 +0000 Message-Id: <20171206115726.5237-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 06 Dec 2017 11:57:41 +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] 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 , Stefan Hajnoczi , qemu-block@nongnu.org, 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 check for an explicit Ctrl-D, aka 0x4, to detect EOF and exit the qemu-io shell. This fixes the regression that prevented Ctrl-D from triggering an e= xit 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 --- qemu-io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qemu-io.c b/qemu-io.c index c70bde3eb1..2ea0bfbaf8 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -322,7 +322,9 @@ 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) { + /* In non-canon tty mode we get 0x4 (Ctrl-D), not the stdio "EOF" + * constant */ + if (ch =3D=3D 0x4) { break; } readline_handle_byte(readline_state, ch); --=20 2.14.3