From patchwork Thu Jun 27 03:27:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 254937 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 141E42C0084 for ; Thu, 27 Jun 2013 13:34:08 +1000 (EST) Received: from localhost ([::1]:32852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2yD-0001mk-VT for incoming@patchwork.ozlabs.org; Wed, 26 Jun 2013 23:34:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2uo-00052B-Lj for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Us2un-0000zl-Oo for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:34 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:46036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us2un-0000z3-0T for qemu-devel@nongnu.org; Wed, 26 Jun 2013 23:30:33 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Jun 2013 00:26:41 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 28 Jun 2013 00:26:39 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 1F9F53578045 for ; Thu, 27 Jun 2013 13:30:28 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5R3FaPR983376 for ; Thu, 27 Jun 2013 13:15:36 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5R3URS8030237 for ; Thu, 27 Jun 2013 13:30:27 +1000 Received: from RH63Wenchao.localdomain ([9.77.178.220]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5R3RvIf024842; Thu, 27 Jun 2013 13:30:24 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 27 Jun 2013 11:27:45 +0800 Message-Id: <1372303666-12323-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372303666-12323-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372303666-12323-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062714-3568-0000-0000-000003D69DED X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.142 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V3 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 | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index e0a4b67..1126540 100644 --- a/monitor.c +++ b/monitor.c @@ -4283,10 +4283,8 @@ 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, + args_cmdline[1]); } break; default: