From b782311e106c47b042fcf9bf5a827d8aedcfc237 Mon Sep 17 00:00:00 2001 From: Zdenek Styblik Date: Sat, 26 Oct 2013 06:55:18 +0000 Subject: [PATCH] ID: 50 - ipmi_hpmfwupg needs a clean up * print error if not enough parameters given, return code 1 * recognize 'help' as a valid parameter * print error if a invalid parameter is given, return code 1 --- ipmitool/lib/ipmi_hpmfwupg.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/ipmitool/lib/ipmi_hpmfwupg.c index 198e2f0..f6afd37 100644 --- a/ipmitool/lib/ipmi_hpmfwupg.c +++ b/ipmitool/lib/ipmi_hpmfwupg.c @@ -2469,11 +2469,15 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv) lprintf(LOG_NOTICE, "\nPICMG HPM.1 Upgrade Agent %d.%d.%d: \n", HPMFWUPG_VERSION_MAJOR, HPMFWUPG_VERSION_MINOR, HPMFWUPG_VERSION_SUBMINOR); - if ((argc == 0) || (strcmp(argv[0], "help") == 0)) { + if (argc < 1) { + lprintf(LOG_ERR, "Not enough parameters given."); HpmfwupgPrintUsage(); return HPMFWUPG_ERROR; } - if ((strcmp(argv[0], "check") == 0)) { + if (strcmp(argv[0], "help") == 0) { + HpmfwupgPrintUsage(); + return HPMFWUPG_SUCCESS; + } else if ((strcmp(argv[0], "check") == 0)) { /* hpm check */ if (argv[1] == NULL) { rc = HpmfwupgTargetCheck(intf,VIEW_MODE); @@ -2633,7 +2637,9 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv) verbose++; rc = HpmfwupgQuerySelftestResult(intf, &cmdCtx, NULL); } else { + lprintf(LOG_ERR, "Invalid HPM command: %s", argv[0]); HpmfwupgPrintUsage(); + rc = HPMFWUPG_ERROR; } return rc; }