kvargs: fix invalid token parsing on FreeBSD

[dpdk.git] / lib / librte_kvargs / rte_kvargs.c

diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index d92a5f9..285081c 100644 (file)
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <rte_log.h>
 #include <rte_string_fns.h>
 
 #include "rte_kvargs.h"
@@ -28,28 +27,37 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params)
         * to pass to rte_strsplit
         */
        kvlist->str = strdup(params);
-       if (kvlist->str == NULL) {
-               RTE_LOG(ERR, PMD, "Cannot parse arguments: not enough memory\n");
+       if (kvlist->str == NULL)
                return -1;
-       }
 
        /* browse each key/value pair and add it in kvlist */
        str = kvlist->str;
        while ((str = strtok_r(str, RTE_KVARGS_PAIRS_DELIM, &ctx1)) != NULL) {
 
                i = kvlist->count;
-               if (i >= RTE_KVARGS_MAX) {
-                       RTE_LOG(ERR, PMD, "Cannot parse arguments: list full\n");
+               if (i >= RTE_KVARGS_MAX)
                        return -1;
-               }
 
                kvlist->pairs[i].key = strtok_r(str, RTE_KVARGS_KV_DELIM, &ctx2);
                kvlist->pairs[i].value = strtok_r(NULL, RTE_KVARGS_KV_DELIM, &ctx2);
-               if (kvlist->pairs[i].key == NULL || kvlist->pairs[i].value == NULL) {
-                       RTE_LOG(ERR, PMD,
-                               "Cannot parse arguments: wrong key or value\n"
-                               "params=<%s>\n", params);
+               if (kvlist->pairs[i].key == NULL ||
+                   kvlist->pairs[i].value == NULL)
                        return -1;
+
+               /* Detect list [a,b] to skip comma delimiter in list. */
+               str = kvlist->pairs[i].value;
+               if (str[0] == '[') {
+                       /* Find the end of the list. */
+                       while (str[strlen(str) - 1] != ']') {
+                               /* Restore the comma erased by strtok_r(). */
+                               if (ctx1 == NULL || ctx1[0] == '\0')
+                                       return -1; /* no closing bracket */
+                               str[strlen(str)] = ',';
+                               /* Parse until next comma. */
+                               str = strtok_r(NULL, RTE_KVARGS_PAIRS_DELIM, &ctx1);
+                               if (str == NULL)
+                                       return -1; /* no closing bracket */
+                       }
                }
 
                kvlist->count++;
@@ -89,12 +97,8 @@ check_for_valid_keys(struct rte_kvargs *kvlist,
        for (i = 0; i < kvlist->count; i++) {
                pair = &kvlist->pairs[i];
                ret = is_valid_key(valid, pair->key);
-               if (!ret) {
-                       RTE_LOG(ERR, PMD,
-                               "Error parsing device, invalid key <%s>\n",
-                               pair->key);
+               if (!ret)
                        return -1;
-               }
        }
        return 0;
 }
@@ -132,6 +136,9 @@ rte_kvargs_process(const struct rte_kvargs *kvlist,
        const struct rte_kvargs_pair *pair;
        unsigned i;
 
+       if (kvlist == NULL)
+               return 0;
+
        for (i = 0; i < kvlist->count; i++) {
                pair = &kvlist->pairs[i];
                if (key_match == NULL || strcmp(pair->key, key_match) == 0) {
@@ -180,3 +187,36 @@ rte_kvargs_parse(const char *args, const char * const valid_keys[])
 
        return kvlist;
 }
+
+struct rte_kvargs *
+rte_kvargs_parse_delim(const char *args, const char * const valid_keys[],
+                      const char *valid_ends)
+{
+       struct rte_kvargs *kvlist = NULL;
+       char *copy;
+       size_t len;
+
+       if (valid_ends == NULL)
+               return rte_kvargs_parse(args, valid_keys);
+
+       copy = strdup(args);
+       if (copy == NULL)
+               return NULL;
+
+       len = strcspn(copy, valid_ends);
+       copy[len] = '\0';
+
+       kvlist = rte_kvargs_parse(copy, valid_keys);
+
+       free(copy);
+       return kvlist;
+}
+
+int
+rte_kvargs_strcmp(const char *key __rte_unused,
+                 const char *value, void *opaque)
+{
+       const char *str = opaque;
+
+       return -abs(strcmp(str, value));
+}