Imported Upstream version 17.05

[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 b496067..b814880 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse.c
+++ b/lib/librte_cmdline/cmdline_parse.c
@@ -146,7 +146,9 @@ nb_common_chars(const char * s1, const char * s2)
  */
 static int
 match_inst(cmdline_parse_inst_t *inst, const char *buf,
-          unsigned int nb_match_token, void *resbuf, unsigned resbuf_size)
+          unsigned int nb_match_token, void *resbuf, unsigned resbuf_size,
+          cmdline_parse_token_hdr_t
+               *(*dyn_tokens)[CMDLINE_PARSE_DYNAMIC_TOKENS])
 {
        unsigned int token_num=0;
        cmdline_parse_token_hdr_t * token_p;
@@ -155,6 +157,11 @@ match_inst(cmdline_parse_inst_t *inst, const char *buf,
        struct cmdline_token_hdr token_hdr;
 
        token_p = inst->tokens[token_num];
+       if (!token_p && dyn_tokens && inst->f) {
+               if (!(*dyn_tokens)[0])
+                       inst->f(&(*dyn_tokens)[0], NULL, dyn_tokens);
+               token_p = (*dyn_tokens)[0];
+       }
        if (token_p)
                memcpy(&token_hdr, token_p, sizeof(token_hdr));
 
@@ -196,7 +203,17 @@ match_inst(cmdline_parse_inst_t *inst, const char *buf,
                buf += n;
 
                token_num ++;
-               token_p = inst->tokens[token_num];
+               if (!inst->tokens[0]) {
+                       if (token_num < (CMDLINE_PARSE_DYNAMIC_TOKENS - 1)) {
+                               if (!(*dyn_tokens)[token_num])
+                                       inst->f(&(*dyn_tokens)[token_num],
+                                               NULL,
+                                               dyn_tokens);
+                               token_p = (*dyn_tokens)[token_num];
+                       } else
+                               token_p = NULL;
+               } else
+                       token_p = inst->tokens[token_num];
                if (token_p)
                        memcpy(&token_hdr, token_p, sizeof(token_hdr));
        }
@@ -238,7 +255,11 @@ cmdline_parse(struct cmdline *cl, const char * buf)
        unsigned int inst_num=0;
        cmdline_parse_inst_t *inst;
        const char *curbuf;
-       char result_buf[CMDLINE_PARSE_RESULT_BUFSIZE];
+       union {
+               char buf[CMDLINE_PARSE_RESULT_BUFSIZE];
+               long double align; /* strong alignment constraint for buf */
+       } result, tmp_result;
+       cmdline_parse_token_hdr_t *dyn_tokens[CMDLINE_PARSE_DYNAMIC_TOKENS];
        void (*f)(void *, struct cmdline *, void *) = NULL;
        void *data = NULL;
        int comment = 0;
@@ -255,6 +276,7 @@ cmdline_parse(struct cmdline *cl, const char * buf)
                return CMDLINE_PARSE_BAD_ARGS;
 
        ctx = cl->ctx;
+       memset(&dyn_tokens, 0, sizeof(dyn_tokens));
 
        /*
         * - look if the buffer contains at least one line
@@ -299,13 +321,16 @@ cmdline_parse(struct cmdline *cl, const char * buf)
                debug_printf("INST %d\n", inst_num);
 
                /* fully parsed */
-               tok = match_inst(inst, buf, 0, result_buf, sizeof(result_buf));
+               tok = match_inst(inst, buf, 0, tmp_result.buf,
+                                sizeof(tmp_result.buf), &dyn_tokens);
 
                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++;
@@ -333,7 +358,7 @@ cmdline_parse(struct cmdline *cl, const char * buf)
 
        /* call func */
        if (f) {
-               f(result_buf, cl, data);
+               f(result.buf, cl, data);
        }
 
        /* no match */
@@ -355,6 +380,7 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
        cmdline_parse_token_hdr_t *token_p;
        struct cmdline_token_hdr token_hdr;
        char tmpbuf[CMDLINE_BUFFER_SIZE], comp_buf[CMDLINE_BUFFER_SIZE];
+       cmdline_parse_token_hdr_t *dyn_tokens[CMDLINE_PARSE_DYNAMIC_TOKENS];
        unsigned int partial_tok_len;
        int comp_len = -1;
        int tmp_len = -1;
@@ -374,6 +400,7 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
 
        debug_printf("%s called\n", __func__);
        memset(&token_hdr, 0, sizeof(token_hdr));
+       memset(&dyn_tokens, 0, sizeof(dyn_tokens));
 
        /* count the number of complete token to parse */
        for (i=0 ; buf[i] ; i++) {
@@ -396,11 +423,24 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
                inst = ctx[inst_num];
                while (inst) {
                        /* parse the first tokens of the inst */
-                       if (nb_token && match_inst(inst, buf, nb_token, NULL, 0))
+                       if (nb_token &&
+                           match_inst(inst, buf, nb_token, NULL, 0,
+                                      &dyn_tokens))
                                goto next;
 
                        debug_printf("instruction match\n");
-                       token_p = inst->tokens[nb_token];
+                       if (!inst->tokens[0]) {
+                               if (nb_token <
+                                   (CMDLINE_PARSE_DYNAMIC_TOKENS - 1)) {
+                                       if (!dyn_tokens[nb_token])
+                                               inst->f(&dyn_tokens[nb_token],
+                                                       NULL,
+                                                       &dyn_tokens);
+                                       token_p = dyn_tokens[nb_token];
+                               } else
+                                       token_p = NULL;
+                       } else
+                               token_p = inst->tokens[nb_token];
                        if (token_p)
                                memcpy(&token_hdr, token_p, sizeof(token_hdr));
 
@@ -490,10 +530,21 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
                /* we need to redo it */
                inst = ctx[inst_num];
 
-               if (nb_token && match_inst(inst, buf, nb_token, NULL, 0))
+               if (nb_token &&
+                   match_inst(inst, buf, nb_token, NULL, 0, &dyn_tokens))
                        goto next2;
 
-               token_p = inst->tokens[nb_token];
+               if (!inst->tokens[0]) {
+                       if (nb_token < (CMDLINE_PARSE_DYNAMIC_TOKENS - 1)) {
+                               if (!dyn_tokens[nb_token])
+                                       inst->f(&dyn_tokens[nb_token],
+                                               NULL,
+                                               &dyn_tokens);
+                               token_p = dyn_tokens[nb_token];
+                       } else
+                               token_p = NULL;
+               } else
+                       token_p = inst->tokens[nb_token];
                if (token_p)
                        memcpy(&token_hdr, token_p, sizeof(token_hdr));