X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_cmdline%2Fcmdline_parse_portlist.c;h=f11bdf033247daaa12103d0321a9fea949528d25;hb=cc4690e980f4759e53a9f3d89f48d285a2801eec;hp=d6980196ae174883a12600f99a99319775b54336;hpb=ab971e562860e30339d66b41799ac029c698a9ab;p=dpdk.git diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/librte_cmdline/cmdline_parse_portlist.c index d6980196ae..f11bdf0332 100644 --- a/lib/librte_cmdline/cmdline_parse_portlist.c +++ b/lib/librte_cmdline/cmdline_parse_portlist.c @@ -1,35 +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. - * */ /* @@ -66,10 +65,6 @@ #include #include #include -#include -#ifndef __linux__ -#include -#endif #include #include "cmdline_parse.h" @@ -83,7 +78,7 @@ struct cmdline_token_ops cmdline_token_portlist_ops = { }; static void -parse_set_list(cmdline_portlist_t * pl, int low, int high) +parse_set_list(cmdline_portlist_t *pl, size_t low, size_t high) { do { pl->map |= (1 << low++); @@ -91,7 +86,7 @@ parse_set_list(cmdline_portlist_t * pl, int low, int high) } static int -parse_ports(cmdline_portlist_t * pl, const char * str) +parse_ports(cmdline_portlist_t *pl, const char *str) { size_t ps, pe; const char *first, *last; @@ -107,7 +102,7 @@ parse_ports(cmdline_portlist_t * pl, const char * str) ps = strtoul(first, &end, 10); if (errno != 0 || end == first || (end[0] != '-' && end[0] != 0 && end != last)) - return (-1); + return -1; /* Support for N-M portlist format */ if (end[0] == '-') { @@ -116,30 +111,33 @@ parse_ports(cmdline_portlist_t * pl, const char * str) pe = strtoul(first, &end, 10); if (errno != 0 || end == first || (end[0] != 0 && end != last)) - return (-1); + return -1; } else { pe = ps; } if (ps > pe || pe >= sizeof (pl->map) * 8) - return (-1); + return -1; parse_set_list(pl, ps, pe); } - return (0); + return 0; } int cmdline_parse_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, - const char *buf, void *res) + const char *buf, void *res, unsigned ressize) { unsigned int token_len = 0; char portlist_str[PORTLIST_TOKEN_SIZE+1]; cmdline_portlist_t *pl; if (!buf || ! *buf) - return (-1); + return -1; + + if (res && ressize < sizeof(cmdline_portlist_t)) + return -1; pl = res; @@ -148,16 +146,16 @@ cmdline_parse_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, token_len++; if (token_len >= PORTLIST_TOKEN_SIZE) - return (-1); + return -1; - rte_snprintf(portlist_str, token_len+1, "%s", buf); + snprintf(portlist_str, token_len+1, "%s", buf); if (pl) { pl->map = 0; if (strcmp("all", portlist_str) == 0) pl->map = UINT32_MAX; else if (parse_ports(pl, portlist_str) != 0) - return (-1); + return -1; } return token_len; @@ -168,7 +166,7 @@ cmdline_get_help_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size) { int ret; - ret = rte_snprintf(dstbuf, size, "range of ports as 3,4-6,8-19,20"); + ret = snprintf(dstbuf, size, "range of ports as 3,4-6,8-19,20"); if (ret < 0) return -1; return 0;