New upstream version 17.11.1

[deb_dpdk.git] / lib / librte_cmdline / cmdline_parse.c

diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c
index 3e12ee5..7f799f9 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse.c
+++ b/lib/librte_cmdline/cmdline_parse.c
@@ -168,6 +168,8 @@ match_inst(cmdline_parse_inst_t *inst, const char *buf,
        int n = 0;
        struct cmdline_token_hdr token_hdr;
 
+       if (resbuf != NULL)
+               memset(resbuf, 0, resbuf_size);
        /* check if we match all tokens of inst */
        while (!nb_match_token || i < nb_match_token) {
                token_p = get_token(inst, i);
@@ -263,6 +265,7 @@ cmdline_parse(struct cmdline *cl, const char * buf)
 #ifdef RTE_LIBRTE_CMDLINE_DEBUG
        char debug_buf[BUFSIZ];
 #endif
+       char *result_buf = result.buf;
 
        if (!cl || !buf)
                return CMDLINE_PARSE_BAD_ARGS;
@@ -312,16 +315,14 @@ cmdline_parse(struct cmdline *cl, const char * buf)
                debug_printf("INST %d\n", inst_num);
 
                /* fully parsed */
-               tok = match_inst(inst, buf, 0, tmp_result.buf,
-                                sizeof(tmp_result.buf));
+               tok = match_inst(inst, buf, 0, result_buf,
+                                CMDLINE_PARSE_RESULT_BUFSIZE);
 
                if (tok > 0) /* we matched at least one token */
                        err = CMDLINE_PARSE_BAD_ARGS;
 
                else if (!tok) {
                        debug_printf("INST fully parsed\n");
-                       memcpy(&result, &tmp_result,
-                              sizeof(result));
                        /* skip spaces */
                        while (isblank2(*curbuf)) {
                                curbuf++;
@@ -332,6 +333,7 @@ cmdline_parse(struct cmdline *cl, const char * buf)
                                if (!f) {
                                        memcpy(&f, &inst->f, sizeof(f));
                                        memcpy(&data, &inst->data, sizeof(data));
+                                       result_buf = tmp_result.buf;
                                }
                                else {
                                        /* more than 1 inst matches */