From cdbab055a1345d2bb010f1747ecde87549b8745b Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 10 Oct 2023 09:49:27 +0530
Subject: [PATCH] Fix empty set in cli tool

---
 src/cwmp_cli.c                    |  6 +++---
 test/cmocka/icwmp_cli_unit_test.c | 18 ------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/cwmp_cli.c b/src/cwmp_cli.c
index bc578d4..3b22342 100644
--- a/src/cwmp_cli.c
+++ b/src/cwmp_cli.c
@@ -77,7 +77,7 @@ static void display_get_cmd_result(struct cmd_input in __attribute__((unused)),
  */
 char *cmd_set_exec_func(struct cmd_input in, union cmd_result *res)
 {
-	if (CWMP_STRLEN(in.first_input) == 0 || CWMP_STRLEN(in.second_input) == 0)
+	if (CWMP_STRLEN(in.first_input) == 0)
 		return "9003";
 
 	LIST_HEAD(faults_list);
@@ -212,7 +212,7 @@ static void display_get_notif_cmd_result(struct cmd_input in __attribute__((unus
  */
 char *cmd_set_notif_exec_func(struct cmd_input in, union cmd_result *res __attribute__((unused)))
 {
-	if (in.first_input == NULL || in.second_input == NULL)
+	if (in.first_input == NULL || CWMP_STRLEN(in.second_input) == 0)
 		return "9003";
 
 	if (!icwmp_validate_int_in_range(in.second_input, 0, 6))
@@ -298,7 +298,7 @@ char *execute_cwmp_cli_command(char *cmd, char *args[])
 
 	struct cmd_input cmd_in = {
 			args[0] ? args[0] : NULL,
-			args[0] && args[1] ? args[1] : NULL,
+			args[0] && args[1] ? args[1] : "",
 			args[0] && args[1] && args[2] ? args[2] : NULL
 	};
 	union cmd_result cmd_out = {0};
diff --git a/test/cmocka/icwmp_cli_unit_test.c b/test/cmocka/icwmp_cli_unit_test.c
index 32a300c..220ce77 100644
--- a/test/cmocka/icwmp_cli_unit_test.c
+++ b/test/cmocka/icwmp_cli_unit_test.c
@@ -95,15 +95,6 @@ static void cwmp_execute_cli_unit_test(void **state)
 	assert_string_equal(fault, "9005");
 	FREE(fault);
 
-	/*
-	 * One argument: Not Valid (9003)
-	 */
-	char *argsset_not_valid[] = {"Device.WiFi.SSID.1.SSID", NULL};
-	fault = execute_cwmp_cli_command("set", argsset_not_valid);
-	assert_non_null(fault);
-	assert_string_equal(fault, "9003");
-	FREE(fault);
-
 	/*
 	 * No argumenst: Not Valid
 	 */
@@ -183,15 +174,6 @@ static void cwmp_set_cli_unit_test(void **state)
 	assert_non_null(fault);
 	assert_string_equal(fault, "9003");
 
-	/*
-	 * Set: only second input is null
-	 */
-	struct cmd_input input2_null = {"Device.WiFi.SSID.1.SSID", NULL};
-	union cmd_result cmd_set_out_2 = { 0 };
-	fault = cmd_set_exec_func(input2_null, &cmd_set_out_2);
-	assert_non_null(fault);
-	assert_string_equal(fault, "9003");
-
 	/*
 	 * Set: Not null and valid inputs
 	 */