X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_string.c;h=0461a85bb9d011d8609bf2e25944a5e11af82e79;hb=e9c659426416c95c4469b16e6bcc7700f1898278;hp=84a82cee625f0c150ffec2f74aede8c7d2e34c5c;hpb=c655293cadc121581b0b964f2f55f9f80fa51c40;p=dpdk.git

diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 84a82cee62..0461a85bb9 100644
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -1,41 +1,12 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 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 
- *   are met:
- * 
- *     * 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 
- *       distribution.
- *     * 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 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 
+#include <rte_common.h>
 #include <rte_string_fns.h>
 
 #include <cmdline_parse.h>
@@ -66,9 +37,10 @@ struct string_elt_str string_elt_strs[] = {
 		{"one#two\nwith\nnewlines#three", "two\nwith\nnewlines", 1},
 };
 
-#if CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE
+#if (CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE) \
+|| (CMDLINE_TEST_BUFSIZE < STR_MULTI_TOKEN_SIZE)
 #undef CMDLINE_TEST_BUFSIZE
-#define CMDLINE_TEST_BUFSIZE STR_TOKEN_SIZE
+#define CMDLINE_TEST_BUFSIZE RTE_MAX(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE)
 #endif
 
 struct string_nb_str {
@@ -98,6 +70,11 @@ struct string_parse_str string_parse_strs[] = {
 		{"two with\rgarbage\tcharacters\n",
 				"one#two with\rgarbage\tcharacters\n#three",
 				"two with\rgarbage\tcharacters\n"},
+		{"one two", "one", "one"}, /* fixed string */
+		{"one two", TOKEN_STRING_MULTI, "one two"}, /* multi string */
+		{"one two", NULL, "one"}, /* any string */
+		{"one two #three", TOKEN_STRING_MULTI, "one two "},
+		/* multi string with comment */
 };
 
 
@@ -125,7 +102,6 @@ struct string_invalid_str string_invalid_strs[] = {
 		 "toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
 		 "toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
 		 "toolong!!!" },
-		 {"invalid", ""},
 		 {"", "invalid"}
 };
 
@@ -162,7 +138,7 @@ test_parse_string_invalid_param(void)
 
 	memset(&token, 0, sizeof(token));
 
-	rte_snprintf(buf, sizeof(buf), "buffer");
+	snprintf(buf, sizeof(buf), "buffer");
 
 	/* test null token */
 	if (cmdline_get_help_string(
@@ -179,7 +155,7 @@ test_parse_string_invalid_param(void)
 		printf("Error: function accepted null token!\n");
 		return -1;
 	}
-	if (cmdline_parse_string(NULL, buf, NULL) != -1) {
+	if (cmdline_parse_string(NULL, buf, NULL, 0) != -1) {
 		printf("Error: function accepted null token!\n");
 		return -1;
 	}
@@ -190,7 +166,8 @@ test_parse_string_invalid_param(void)
 		return -1;
 	}
 	if (cmdline_parse_string(
-			(cmdline_parse_token_hdr_t*)&token, NULL, (void*)&result) != -1) {
+			(cmdline_parse_token_hdr_t*)&token, NULL,
+			(void*)&result, sizeof(result)) != -1) {
 		printf("Error: function accepted null buffer!\n");
 		return -1;
 	}
@@ -201,7 +178,7 @@ test_parse_string_invalid_param(void)
 	}
 	/* test null result */
 	if (cmdline_parse_string(
-			(cmdline_parse_token_hdr_t*)&token, buf, NULL) == -1) {
+			(cmdline_parse_token_hdr_t*)&token, buf, NULL, 0) == -1) {
 		printf("Error: function rejected null result!\n");
 		return -1;
 	}
@@ -234,7 +211,8 @@ test_parse_string_invalid_data(void)
 		token.string_data.str = string_invalid_strs[i].fixed_str;
 
 		if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
-				string_invalid_strs[i].str, (void*)buf) != -1) {
+				string_invalid_strs[i].str, (void*)buf,
+				sizeof(buf)) != -1) {
 			memset(help_str, 0, sizeof(help_str));
 			memset(&help_token, 0, sizeof(help_token));
 
@@ -331,7 +309,8 @@ test_parse_string_valid(void)
 		token.string_data.str = string_parse_strs[i].fixed_str;
 
 		if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
-				string_parse_strs[i].str, (void*)buf) < 0) {
+				string_parse_strs[i].str, (void*)buf,
+				sizeof(buf)) < 0) {
 
 			/* clean help data */
 			memset(&help_token, 0, sizeof(help_token));
@@ -348,8 +327,7 @@ test_parse_string_valid(void)
 					string_parse_strs[i].str, help_str);
 			return -1;
 		}
-		if (strncmp(buf, string_parse_strs[i].result,
-				sizeof(string_parse_strs[i].result) - 1) != 0) {
+		if (strcmp(buf, string_parse_strs[i].result) != 0) {
 			printf("Error: result mismatch!\n");
 			return -1;
 		}