From patchwork Thu Jul 11 03:13: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: 258289 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 472982C02EC for ; Thu, 11 Jul 2013 13:18:22 +1000 (EST) Received: from localhost ([::1]:43389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux7Od-0005v7-To for incoming@patchwork.ozlabs.org; Wed, 10 Jul 2013 23:18:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux7Mz-0003eo-LP for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ux7My-00011r-FM for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:37 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:45208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ux7Mx-00011k-TX for qemu-devel@nongnu.org; Wed, 10 Jul 2013 23:16:36 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 11 Jul 2013 13:04:30 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 11 Jul 2013 13:04:27 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 3F8BD2CE804A for ; Thu, 11 Jul 2013 13:16:31 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6B31DqR1704416 for ; Thu, 11 Jul 2013 13:01:14 +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 r6B3GUWu017497 for ; Thu, 11 Jul 2013 13:16:30 +1000 Received: from RH63Wenchao.localdomain ([9.125.25.246]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r6B3DtfT011597; Thu, 11 Jul 2013 13:16:27 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 11 Jul 2013 11:13:44 +0800 Message-Id: <1373512429-17865-9-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1373512429-17865-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1373512429-17865-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13071103-0260-0000-0000-0000034B192C X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.140 Cc: pbonzini@redhat.com, Wenchao Xia , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V6 08/13] 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 to as paired function to free the result. Signed-off-by: Wenchao Xia --- monitor.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 14 deletions(-) diff --git a/monitor.c b/monitor.c index db63223..2d4f699 100644 --- a/monitor.c +++ b/monitor.c @@ -801,9 +801,31 @@ 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; + + nb_args = nb_args < MAX_ARGS ? 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. + */ +static int parse_cmdline(const char *cmdline, + int *pnb_args, char **args) { const char *p; int nb_args, ret; @@ -811,24 +833,26 @@ static void parse_cmdline(const char *cmdline, p = cmdline; nb_args = 0; - for (;;) { + while (nb_args < MAX_ARGS) { while (qemu_isspace(*p)) { p++; } if (*p == '\0') { break; } - if (nb_args >= MAX_ARGS) { - break; - } 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, @@ -4144,7 +4168,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]); @@ -4234,9 +4260,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)