From patchwork Fri Aug 23 08:18:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 269335 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 D90B02C009A for ; Fri, 23 Aug 2013 18:22:52 +1000 (EST) Received: from localhost ([::1]:35690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCmdv-0000fw-12 for incoming@patchwork.ozlabs.org; Fri, 23 Aug 2013 04:22:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCmbe-00060u-N2 for qemu-devel@nongnu.org; Fri, 23 Aug 2013 04:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCmbV-0007W3-Ar for qemu-devel@nongnu.org; Fri, 23 Aug 2013 04:20:30 -0400 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:45737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCmbU-0007VR-NG for qemu-devel@nongnu.org; Fri, 23 Aug 2013 04:20:21 -0400 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Aug 2013 13:40:06 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 23 Aug 2013 13:40:03 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 62C6F1258051 for ; Fri, 23 Aug 2013 13:50:02 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7N8LkxT42074286 for ; Fri, 23 Aug 2013 13:51:46 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r7N8KE1B008179 for ; Fri, 23 Aug 2013 13:50:14 +0530 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.92]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r7N8IAbE001948; Fri, 23 Aug 2013 13:50:13 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 23 Aug 2013 16:18:02 +0800 Message-Id: <1377245887-22745-11-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1377245887-22745-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1377245887-22745-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13082308-5816-0000-0000-0000098C4B55 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.2 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V9 10/15] monitor: refine parse_cmdline() 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 Since this function will be used by help_cmd() later, so improve it to make it more generic and easier to use. free_cmdline_args() is added too as paired function to free the result. One change of this function is that, when the valid args in input exceed the limit of MAX_ARGS, it fails now, instead of return with MAX_ARGS of parsed args in old code. This should not impact much since it is rare that user input many args in monitor's "help" and auto complete scenario. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- monitor.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index 1db0117..8897291 100644 --- a/monitor.c +++ b/monitor.c @@ -821,9 +821,33 @@ static int get_str(char *buf, int buf_size, const char **pp) #define MAX_ARGS 16 -/* NOTE: this parser is an approximate form of the real command parser */ -static void parse_cmdline(const char *cmdline, - int *pnb_args, char **args) +static void free_cmdline_args(char **args, int nb_args) +{ + int i; + + assert(nb_args <= MAX_ARGS); + + for (i = 0; i < nb_args; i++) { + g_free(args[i]); + } + +} + +/* + * Parse the command line to get valid args. + * @cmdline: command line to be parsed. + * @pnb_args: location to store the number of args, must NOT be NULL. + * @args: location to store the args, which should be freed by caller, must + * NOT be NULL. + * + * Returns 0 on success, negative on failure. + * + * NOTE: this parser is an approximate form of the real command parser. Number + * of args have a limit of MAX_ARGS. If cmdline contains more, it will + * return with failure. + */ +static int parse_cmdline(const char *cmdline, + int *pnb_args, char **args) { const char *p; int nb_args, ret; @@ -839,16 +863,21 @@ static void parse_cmdline(const char *cmdline, break; } if (nb_args >= MAX_ARGS) { - break; + goto fail; } ret = get_str(buf, sizeof(buf), &p); - args[nb_args] = g_strdup(buf); - nb_args++; if (ret < 0) { - break; + goto fail; } + args[nb_args] = g_strdup(buf); + nb_args++; } *pnb_args = nb_args; + return 0; + + fail: + free_cmdline_args(args, nb_args); + return -1; } static void help_cmd_dump(Monitor *mon, const mon_cmd_t *cmds, @@ -4168,7 +4197,9 @@ static void monitor_find_completion(Monitor *mon, const mon_cmd_t *cmd; MonitorBlockComplete mbs; - parse_cmdline(cmdline, &nb_args, args); + if (parse_cmdline(cmdline, &nb_args, args) < 0) { + return; + } #ifdef DEBUG_COMPLETION for (i = 0; i < nb_args; i++) { monitor_printf(mon, "arg%d = '%s'\n", i, args[i]); @@ -4258,9 +4289,7 @@ static void monitor_find_completion(Monitor *mon, } cleanup: - for (i = 0; i < nb_args; i++) { - g_free(args[i]); - } + free_cmdline_args(args, nb_args); } static int monitor_can_read(void *opaque)