From patchwork Fri Jun 28 03:39:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 255272 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 2CC212C0366 for ; Fri, 28 Jun 2013 13:49:57 +1000 (EST) Received: from localhost ([::1]:49903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsPay-0001T0-Ra for incoming@patchwork.ozlabs.org; Thu, 27 Jun 2013 23:43:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsPYt-0006hv-JQ for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsPYs-0007Zf-Fo for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:27 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:38022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsPYr-0007Z1-P8 for qemu-devel@nongnu.org; Thu, 27 Jun 2013 23:41:26 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Jun 2013 09:04:15 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 28 Jun 2013 09:04:12 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 845063940043 for ; Fri, 28 Jun 2013 09:11:19 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5S3fevg21692488 for ; Fri, 28 Jun 2013 09:11:40 +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 r5S3fIMP026631 for ; Fri, 28 Jun 2013 13:41:18 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.127]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5S3dhBW020808; Fri, 28 Jun 2013 13:41:17 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2013 11:39:30 +0800 Message-Id: <1372390771-11157-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1372390771-11157-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1372390771-11157-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13062803-8878-0000-0000-000007BAB390 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.7 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V4 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 5a66fb0..d07f6ec 100644 --- a/monitor.c +++ b/monitor.c @@ -4284,10 +4284,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: