From patchwork Mon Jun 24 12:48:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 253827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF7822C0095 for ; Mon, 24 Jun 2013 22:52:50 +1000 (EST) Received: from localhost ([::1]:50185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6GG-0007Da-Nh for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 08:52:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6EH-0003iz-P5 for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur6EC-0001mN-Om for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:45 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:43400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur6EC-0001ld-63 for qemu-devel@nongnu.org; Mon, 24 Jun 2013 08:50:40 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 24 Jun 2013 18:12:01 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 24 Jun 2013 18:11:59 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id F07EB1258043 for ; Mon, 24 Jun 2013 18:19:37 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5OComDu29491398 for ; Mon, 24 Jun 2013 18:20:48 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5OCoYLI016187 for ; Mon, 24 Jun 2013 22:50:34 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.50] (may be forged)) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5OCmmO2009047; Mon, 24 Jun 2013 22:50:33 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2013 20:48:44 +0800 Message-Id: <1372078125-31085-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372078125-31085-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372078125-31085-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062412-2000-0000-0000-00000C9DDB52 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V2 6/7] monitor: improve "help" in auto completion for sub command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now special case "help *" in auto completion can work with sub commands, such as "help info a*". Signed-off-by: Wenchao Xia --- monitor.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index f364a0d..8b26b48 100644 --- a/monitor.c +++ b/monitor.c @@ -4273,10 +4273,7 @@ static void monitor_find_completion_by_table(Monitor *mon, cmd_completion(mon, str, QKeyCode_lookup[i]); } } else if (!strcmp(cmd->name, "help|?")) { - readline_set_completion_index(mon->rs, strlen(str)); - for (cmd = mon->cmd_table; cmd->name != NULL; cmd++) { - cmd_completion(mon, str, cmd->name); - } + monitor_find_completion_by_table(mon, cmd_table, p); } break; default: