From patchwork Sat Jun 29 03:53:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 255714 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 5D3D92C0084 for ; Sat, 29 Jun 2013 13:58:32 +1000 (EST) Received: from localhost ([::1]:35805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsmIw-0007H0-JX for incoming@patchwork.ozlabs.org; Fri, 28 Jun 2013 23:58:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsmFW-00027p-Mm for qemu-devel@nongnu.org; Fri, 28 Jun 2013 23:55:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsmFV-0003kv-Je for qemu-devel@nongnu.org; Fri, 28 Jun 2013 23:54:58 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:34547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsmFV-0003kW-1u for qemu-devel@nongnu.org; Fri, 28 Jun 2013 23:54:57 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 29 Jun 2013 09:20:11 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 29 Jun 2013 09:20:08 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 760B5E004F for ; Sat, 29 Jun 2013 09:24:27 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5T3sl3q28770356 for ; Sat, 29 Jun 2013 09:24:47 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5T3spLD016943 for ; Sat, 29 Jun 2013 13:54:51 +1000 Received: from RH63Wenchao.localdomain ([9.125.30.144]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5T3r7oX013963; Sat, 29 Jun 2013 13:54:49 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 29 Jun 2013 11:53:00 +0800 Message-Id: <1372477981-7512-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372477981-7512-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372477981-7512-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062903-2674-0000-0000-0000099C1995 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V5 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 2f5b91d..3ef18ee 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: