Commit cbe9216e authored by Paul Luse's avatar Paul Luse Committed by Jim Harris
Browse files

blobcli: fix incorrect error message 



If a config file is specified an error message would incorrectly
print.

Change-Id: I532762f6e6ed26bd213255b0e67663035fc1620e
Signed-off-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/382876


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent e5044f79

examples/blob/cli/blobcli.c

+4 −4
Original line number Diff line number Diff line
@@ -958,12 +958,14 @@ cmd_parser(int argc, char **argv, struct cli_context_t *cli_context) 
	int op;

	int cmd_chosen = 0;

	char resp;

	bool cfg_specified = false;



	while ((op = getopt(argc, argv, "c:d:f:hil:m:n:p:r:s:ST:Xx:")) != -1) {

		switch (op) {

		case 'c':

			if (cli_context->app_started == false) {

				cmd_chosen++;

				cfg_specified = true;

				cli_context->config_file = optarg;

			} else {

				usage(cli_context, "ERROR: -c option not valid during shell mode.\n");
@@ -1086,12 +1088,10 @@ cmd_parser(int argc, char **argv, struct cli_context_t *cli_context) 
			usage(cli_context, "ERROR: invalid option\n");

		}

		/* config file is the only option that can be combined */

		if (op != 'c') {

			if (cmd_chosen > 1) {

		if (cfg_specified == false  && cmd_chosen > 1) {

			usage(cli_context, "Error: Please choose only one command\n");

		}

	}

	}



	if (cli_context->cli_mode == CLI_MODE_CMD && cmd_chosen == 0) {

		usage(cli_context, "Error: Please choose a command.\n");