From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 8C54537B4 for ; Tue, 9 Oct 2018 04:19:05 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 34A4F22107; Mon, 8 Oct 2018 22:19:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 08 Oct 2018 22:19:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=y+Mg9bHX44 FGzSfxz661KVM+7jf68d50oML9UnQlxxc=; b=CDIR7d533qqpV4/8abs34ujS2H hQNPdCW/U6vfjdE1+3B6ncLIrFFX3aztedCmu+H6lRJ+ofWZnIMuLf3DYi9j8ADD IQrYrtilfgMefDrGCYmGQIoBkr/Vb5xoB9KVf7Tpz7pwj2jRyn4lu6xQP44WhuKl rWb3KqmMKiSeDpqsg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=y+Mg9bHX44FGzSfxz661KVM+7jf68d50oML9UnQlxxc=; b=az236fr1 IdgYpPcz2GnujL8kTincN9KcyYh9o216eFXXWNKLlT/BizU4ekvStSIm4ZJk9Y7I VB273e6FFYty0coVIuRhreeHWEqZLzUQrTdfoeKmIUZQZnVFB6XV/7ZBmttbxPDP K7PYiG30NRfjf8Y9hW2DZjtnGkKNQEDrQDh3tXXEFdPL+ytUJZTDUdVkekrkqInA DVFOcqSETgRlFVSMBM8Gs/hxURKyS71ZoWdj5pDuIiQHnvyeRTOZQlQffw72OTMl zpW8qIqXdD2pph75FzAfxR1JoerSwzocgycAU4JqHy4SATjsJaPjr94xz4q5cJH7 P55YDTIoWB3taQ== X-ME-Sender: X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 9EB03102F1; Mon, 8 Oct 2018 22:19:03 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: gaetan.rivet@6wind.com, ophirmu@mellanox.com, ferruh.yigit@intel.com, arybchenko@solarflare.com, olivier.matz@6wind.com, remy.horton@intel.com Date: Tue, 9 Oct 2018 04:18:55 +0200 Message-Id: <20181009021858.19216-2-thomas@monjalon.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009021858.19216-1-thomas@monjalon.net> References: <20181009021858.19216-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/4] kvargs: support list value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 02:19:05 -0000 If a value contains a comma, rte_kvargs_tokenize() will split here. In order to support list syntax [a,b] as value, an extra parsing of the square brackets is added. Signed-off-by: Thomas Monjalon --- lib/librte_kvargs/rte_kvargs.c | 10 ++++++++++ test/test/test_kvargs.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index a28f76945..b0774effb 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -44,6 +44,16 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params) kvlist->pairs[i].value == NULL) return -1; + /* Detect list [a,b] to skip comma delimiter in list. */ + if (kvlist->pairs[i].value[0] == '[') { + /* Parse the end of the list. */ + str = strtok_r(NULL, "]", &ctx1); + if (str == NULL) + return -1; /* no closing bracket */ + /* Add back the bracket erased by strtok_t(). */ + *(str - 1) = ']'; + } + kvlist->count++; str = NULL; } diff --git a/test/test/test_kvargs.c b/test/test/test_kvargs.c index e6738624e..cb38b385c 100644 --- a/test/test/test_kvargs.c +++ b/test/test/test_kvargs.c @@ -137,6 +137,22 @@ static int test_valid_kvargs(void) } rte_kvargs_free(kvlist); + /* third test using list as value */ + args = "foo=[0,1],check=value2"; + valid_keys = valid_keys_list; + kvlist = rte_kvargs_parse(args, valid_keys); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error"); + goto fail; + } + count = kvlist->count; + if (count != 2) { + printf("invalid count value %d\n", count); + rte_kvargs_free(kvlist); + goto fail; + } + rte_kvargs_free(kvlist); + return 0; fail: @@ -162,6 +178,7 @@ static int test_invalid_kvargs(void) "foo=1,,foo=2", /* empty key/value */ "foo=1,foo", /* no value */ "foo=1,=2", /* no key */ + "foo=[1,2", /* no closing bracket in value */ ",=", /* also test with a smiley */ NULL }; const char **args; -- 2.19.0