X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_cmdline%2Fcmdline_parse_num.c;h=d8cf37f06547c118e6eaf6d77a314fbd440c92f5;hb=873a61c7526be06f45d8d709a7c56d10cc06ab34;hp=087cf483f077aeaf094c7b37f3353eb0ec52a84e;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c index 087cf483f0..d8cf37f065 100644 --- a/lib/librte_cmdline/cmdline_parse_num.c +++ b/lib/librte_cmdline/cmdline_parse_num.c @@ -1,36 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * version: DPDK.L.1.2.3-3 */ /* @@ -91,8 +89,6 @@ enum num_parse_state_t { DEC_NEG, BIN, HEX, - FLOAT_POS, - FLOAT_NEG, ERROR, @@ -103,17 +99,12 @@ enum num_parse_state_t { BIN_OK, DEC_NEG_OK, DEC_POS_OK, - FLOAT_POS_OK, - FLOAT_NEG_OK }; /* Keep it sync with enum in .h */ static const char * num_help[] = { "UINT8", "UINT16", "UINT32", "UINT64", "INT8", "INT16", "INT32", "INT64", -#ifdef CMDLINE_HAVE_FLOAT - "FLOAT", -#endif }; static inline int @@ -128,22 +119,64 @@ add_to_res(unsigned int c, uint64_t *res, unsigned int base) return 0; } +static int +check_res_size(struct cmdline_token_num_data *nd, unsigned ressize) +{ + switch (nd->type) { + case INT8: + case UINT8: + if (ressize < sizeof(int8_t)) + return -1; + break; + case INT16: + case UINT16: + if (ressize < sizeof(int16_t)) + return -1; + break; + case INT32: + case UINT32: + if (ressize < sizeof(int32_t)) + return -1; + break; + case INT64: + case UINT64: + if (ressize < sizeof(int64_t)) + return -1; + break; + default: + return -1; + } + return 0; +} -/* parse an int or a float */ +/* parse an int */ int -cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) +cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, + unsigned ressize) { struct cmdline_token_num_data nd; enum num_parse_state_t st = START; - const char * buf = srcbuf; - char c = *buf; + const char * buf; + char c; uint64_t res1 = 0; -#ifdef CMDLINE_HAVE_FLOAT - uint64_t res2 = 0, res3 = 1; -#endif + + if (!tk) + return -1; + + if (!srcbuf || !*srcbuf) + return -1; + + buf = srcbuf; + c = *buf; memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd)); + /* check that we have enough room in res */ + if (res) { + if (check_res_size(&nd, ressize) < 0) + return -1; + } + while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) { debug_printf("%c %x -> ", c, c); switch (st) { @@ -154,12 +187,6 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) else if (c == '0') { st = ZERO_OK; } -#ifdef CMDLINE_HAVE_FLOAT - else if (c == '.') { - st = FLOAT_POS; - res1 = 0; - } -#endif else if (c >= '1' && c <= '9') { if (add_to_res(c - '0', &res1, 10) < 0) st = ERROR; @@ -178,12 +205,6 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) else if (c == 'b') { st = BIN; } -#ifdef CMDLINE_HAVE_FLOAT - else if (c == '.') { - st = FLOAT_POS; - res1 = 0; - } -#endif else if (c >= '0' && c <= '7') { if (add_to_res(c - '0', &res1, 10) < 0) st = ERROR; @@ -202,12 +223,6 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) else st = DEC_NEG_OK; } -#ifdef CMDLINE_HAVE_FLOAT - else if (c == '.') { - res1 = 0; - st = FLOAT_NEG; - } -#endif else { st = ERROR; } @@ -218,11 +233,6 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) if (add_to_res(c - '0', &res1, 10) < 0) st = ERROR; } -#ifdef CMDLINE_HAVE_FLOAT - else if (c == '.') { - st = FLOAT_NEG; - } -#endif else { st = ERROR; } @@ -233,11 +243,6 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) if (add_to_res(c - '0', &res1, 10) < 0) st = ERROR; } -#ifdef CMDLINE_HAVE_FLOAT - else if (c == '.') { - st = FLOAT_POS; - } -#endif else { st = ERROR; } @@ -287,70 +292,12 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) st = ERROR; } break; - -#ifdef CMDLINE_HAVE_FLOAT - case FLOAT_POS: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', &res2, 10) < 0) - st = ERROR; - else - st = FLOAT_POS_OK; - res3 = 10; - } - else { - st = ERROR; - } - break; - - case FLOAT_NEG: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', &res2, 10) < 0) - st = ERROR; - else - st = FLOAT_NEG_OK; - res3 = 10; - } - else { - st = ERROR; - } - break; - - case FLOAT_POS_OK: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', &res2, 10) < 0) - st = ERROR; - if (add_to_res(0, &res3, 10) < 0) - st = ERROR; - } - else { - st = ERROR; - } - break; - - case FLOAT_NEG_OK: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', &res2, 10) < 0) - st = ERROR; - if (add_to_res(0, &res3, 10) < 0) - st = ERROR; - } - else { - st = ERROR; - } - break; -#endif - default: debug_printf("not impl "); } -#ifdef CMDLINE_HAVE_FLOAT - debug_printf("(%"PRIu32") (%"PRIu32") (%"PRIu32")\n", - res1, res2, res3); -#else - debug_printf("(%"PRIu32")\n", res1); -#endif + debug_printf("(%"PRIu64")\n", res1); buf ++; c = *buf; @@ -367,47 +314,37 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) case OCTAL_OK: case BIN_OK: if ( nd.type == INT8 && res1 <= INT8_MAX ) { - if (res) - *(int8_t *)res = (int8_t) res1; + if (res) *(int8_t *)res = (int8_t) res1; return (buf-srcbuf); } else if ( nd.type == INT16 && res1 <= INT16_MAX ) { - if (res) - *(int16_t *)res = (int16_t) res1; + if (res) *(int16_t *)res = (int16_t) res1; return (buf-srcbuf); } else if ( nd.type == INT32 && res1 <= INT32_MAX ) { - if (res) - *(int32_t *)res = (int32_t) res1; + if (res) *(int32_t *)res = (int32_t) res1; + return (buf-srcbuf); + } + else if ( nd.type == INT64 && res1 <= INT64_MAX ) { + if (res) *(int64_t *)res = (int64_t) res1; return (buf-srcbuf); } else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) { - if (res) - *(uint8_t *)res = (uint8_t) res1; + if (res) *(uint8_t *)res = (uint8_t) res1; return (buf-srcbuf); } else if (nd.type == UINT16 && res1 <= UINT16_MAX ) { - if (res) - *(uint16_t *)res = (uint16_t) res1; + if (res) *(uint16_t *)res = (uint16_t) res1; return (buf-srcbuf); } - else if ( nd.type == UINT32 ) { - if (res) - *(uint32_t *)res = (uint32_t) res1; + else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) { + if (res) *(uint32_t *)res = (uint32_t) res1; return (buf-srcbuf); } else if ( nd.type == UINT64 ) { - if (res) - *(uint64_t *)res = res1; - return (buf-srcbuf); - } -#ifdef CMDLINE_HAVE_FLOAT - else if ( nd.type == FLOAT ) { - if (res) - *(float *)res = (float)res1; + if (res) *(uint64_t *)res = res1; return (buf-srcbuf); } -#endif else { return -1; } @@ -415,59 +352,25 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) case DEC_NEG_OK: if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) { - if (res) - *(int8_t *)res = (int8_t) (-res1); + if (res) *(int8_t *)res = (int8_t) (-res1); return (buf-srcbuf); } else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) { - if (res) - *(int16_t *)res = (int16_t) (-res1); + if (res) *(int16_t *)res = (int16_t) (-res1); return (buf-srcbuf); } else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) { - if (res) - *(int32_t *)res = (int32_t) (-res1); - return (buf-srcbuf); - } -#ifdef CMDLINE_HAVE_FLOAT - else if ( nd.type == FLOAT ) { - if (res) - *(float *)res = - (float)res1; - return (buf-srcbuf); - } -#endif - else { - return -1; - } - break; - -#ifdef CMDLINE_HAVE_FLOAT - case FLOAT_POS: - case FLOAT_POS_OK: - if ( nd.type == FLOAT ) { - if (res) - *(float *)res = (float)res1 + ((float)res2 / (float)res3); + if (res) *(int32_t *)res = (int32_t) (-res1); return (buf-srcbuf); - } - else { - return -1; - } - break; - - case FLOAT_NEG: - case FLOAT_NEG_OK: - if ( nd.type == FLOAT ) { - if (res) - *(float *)res = - ((float)res1 + ((float)res2 / (float)res3)); + else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) { + if (res) *(int64_t *)res = (int64_t) (-res1); return (buf-srcbuf); - } else { return -1; } break; -#endif default: debug_printf("error\n"); return -1; @@ -475,11 +378,15 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res) } -/* parse an int or a float */ +/* parse an int */ int cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size) { struct cmdline_token_num_data nd; + int ret; + + if (!tk) + return -1; memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd)); @@ -487,7 +394,9 @@ cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int s /* if (nd.type >= (sizeof(num_help)/sizeof(const char *))) */ /* return -1; */ - rte_snprintf(dstbuf, size, "%s", num_help[nd.type]); + ret = snprintf(dstbuf, size, "%s", num_help[nd.type]); + if (ret < 0) + return -1; dstbuf[size-1] = '\0'; return 0; }