From patchwork Thu Mar 30 18:54:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allain Legacy X-Patchwork-Id: 22928 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 628E95599; Thu, 30 Mar 2017 20:55:04 +0200 (CEST) Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by dpdk.org (Postfix) with ESMTP id D1C1A2C38 for ; Thu, 30 Mar 2017 20:54:41 +0200 (CEST) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id v2UIsefR024118 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 30 Mar 2017 11:54:40 -0700 (PDT) Received: from yow-cgts4-lx.wrs.com (128.224.145.137) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.294.0; Thu, 30 Mar 2017 11:54:39 -0700 From: Allain Legacy To: , CC: , , Date: Thu, 30 Mar 2017 14:54:07 -0400 Message-ID: <20170330185407.61220-7-allain.legacy@windriver.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170330185407.61220-1-allain.legacy@windriver.com> References: <20170328164431.12475-1-allain.legacy@windriver.com> <20170330185407.61220-1-allain.legacy@windriver.com> MIME-Version: 1.0 X-Originating-IP: [128.224.145.137] Subject: [dpdk-dev] [PATCH v4 6/6] cfgfile: add support for empty value string 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit adds support to the cfgfile library for parsing a key=value line that has no value string specified (e.g., "key="). This can be used to override a configuration attribute that has a default value or default list of values to set it back to an undefined value to disable functionality. Signed-off-by: Allain Legacy --- lib/librte_cfgfile/rte_cfgfile.c | 23 ++++++++++++------ lib/librte_cfgfile/rte_cfgfile.h | 6 +++++ test/test/test_cfgfile.c | 32 +++++++++++++++++++++++++ test/test/test_cfgfiles/etc/empty_key_value.ini | 2 +- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c index 4ef7decb3..b54a523d2 100644 --- a/lib/librte_cfgfile/rte_cfgfile.c +++ b/lib/librte_cfgfile/rte_cfgfile.c @@ -258,12 +258,21 @@ rte_cfgfile_load_with_params(const char *filename, int flags, struct rte_cfgfile_section *sect = cfg->sections[curr_section]; - char *split[2]; - if (rte_strsplit(buffer, sizeof(buffer), split, 2, '=') - != 2) { - printf("Error at line %d - cannot split " - "string\n", lineno); - goto error1; + int n; + char *split[2] = {NULL}; + n = rte_strsplit(buffer, sizeof(buffer), split, 2, '='); + if (flags & CFG_FLAG_EMPTY_VALUES) { + if ((n < 1) || (n > 2)) { + printf("Error at line %d - cannot split string, n=%d\n", + lineno, n); + goto error1; + } + } else { + if (n != 2) { + printf("Error at line %d - cannot split string, n=%d\n", + lineno, n); + goto error1; + } } curr_entry++; @@ -293,7 +302,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags, snprintf(entry->name, sizeof(entry->name), "%s", split[0]); snprintf(entry->value, sizeof(entry->value), "%s", - split[1]); + split[1] ? split[1] : ""); _strip(entry->name, strnlen(entry->name, sizeof(entry->name))); _strip(entry->value, strnlen(entry->value, diff --git a/lib/librte_cfgfile/rte_cfgfile.h b/lib/librte_cfgfile/rte_cfgfile.h index 41d66b829..34d63cc9b 100644 --- a/lib/librte_cfgfile/rte_cfgfile.h +++ b/lib/librte_cfgfile/rte_cfgfile.h @@ -80,6 +80,12 @@ enum { * section. */ CFG_FLAG_GLOBAL_SECTION = 1, + + /** + * Indicates that file supports key value entries where the value can + * be zero length (e.g., "key="). + */ + CFG_FLAG_EMPTY_VALUES = 2, }; /**@} */ diff --git a/test/test/test_cfgfile.c b/test/test/test_cfgfile.c index 8eabd711c..4cc9b14dd 100644 --- a/test/test/test_cfgfile.c +++ b/test/test/test_cfgfile.c @@ -193,6 +193,35 @@ test_cfgfile_invalid_key_value_pair(void) } static int +test_cfgfile_empty_key_value_pair(void) +{ + struct rte_cfgfile *cfgfile; + const char *value; + int ret; + + cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", + CFG_FLAG_EMPTY_VALUES); + TEST_ASSERT_NOT_NULL(cfgfile, "Failed to parse empty_key_value.ini"); + + ret = rte_cfgfile_num_sections(cfgfile, NULL, 0); + TEST_ASSERT(ret == 1, "Unexpected number of sections: %d", ret); + + ret = rte_cfgfile_has_section(cfgfile, "section1"); + TEST_ASSERT(ret, "section1 missing"); + + ret = rte_cfgfile_section_num_entries(cfgfile, "section1"); + TEST_ASSERT(ret == 1, "section1 unexpected number of entries: %d", ret); + + value = rte_cfgfile_get_entry(cfgfile, "section1", "key"); + TEST_ASSERT(strlen(value) == 0, "key unexpected value: %s", value); + + ret = rte_cfgfile_close(cfgfile); + TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + + return 0; +} + +static int test_cfgfile_missing_section(void) { struct rte_cfgfile *cfgfile; @@ -272,6 +301,9 @@ test_cfgfile(void) if (test_cfgfile_invalid_key_value_pair()) return -1; + if (test_cfgfile_empty_key_value_pair()) + return -1; + if (test_cfgfile_missing_section()) return -1; diff --git a/test/test/test_cfgfiles/etc/empty_key_value.ini b/test/test/test_cfgfiles/etc/empty_key_value.ini index 8f203ce3e..53284467b 100644 --- a/test/test/test_cfgfiles/etc/empty_key_value.ini +++ b/test/test/test_cfgfiles/etc/empty_key_value.ini @@ -1,3 +1,3 @@ [section1] ; this is section 1 -invalid= +key=