- *
- * 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
- * * 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
- * * 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
- *
- * 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
};
/* Keep it sync with enum in .h */
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32", "UINT64",
"INT8", "INT16", "INT32", "INT64",
};
/* Keep it sync with enum in .h */
static const char * num_help[] = {
"UINT8", "UINT16", "UINT32", "UINT64",
"INT8", "INT16", "INT32", "INT64",
+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;
+}
-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)
while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
debug_printf("%c %x -> ", c, c);
switch (st) {
while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
debug_printf("%c %x -> ", c, c);
switch (st) {
else if (c >= '1' && c <= '9') {
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
else if (c >= '1' && c <= '9') {
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
else if (c >= '0' && c <= '7') {
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
else if (c >= '0' && c <= '7') {
if (add_to_res(c - '0', &res1, 10) < 0)
st = ERROR;
-
-#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
-
-#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);
-#ifdef CMDLINE_HAVE_FLOAT
- else if ( nd.type == FLOAT ) {
- if (res)
- *(float *)res = - (float)res1;
- return (buf-srcbuf);
+ else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
+ if (res) *(int64_t *)res = (int64_t) (-res1);
+ return buf-srcbuf;
-
-#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);
- 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));
- return (buf-srcbuf);
-
- }
- else {
- return -1;
- }
- break;
-#endif
int
cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
{
struct cmdline_token_num_data nd;
int
cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size)
{
struct cmdline_token_num_data nd;
- rte_snprintf(dstbuf, size, "%s", num_help[nd.type]);
+ ret = snprintf(dstbuf, size, "%s", num_help[nd.type]);
+ if (ret < 0)
+ return -1;