mirror of
https://github.com/ipmitool/ipmitool.git
synced 2025-05-12 19:47:23 +00:00
Cleaned up return codes for invalid arguments passed to sub-commands.
This commit is contained in:
parent
070f36d1ae
commit
b3d2bb937d
@ -2115,6 +2115,7 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
lprintf(LOG_NOTICE, "Invalid LAN command: %s", argv[0]);
|
lprintf(LOG_NOTICE, "Invalid LAN command: %s", argv[0]);
|
||||||
|
rc = -1;
|
||||||
}
|
}
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -567,6 +567,10 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
else if (!strncmp(argv[0], "selftest", 8)) {
|
else if (!strncmp(argv[0], "selftest", 8)) {
|
||||||
rc = ipmi_mc_get_selftest(intf);
|
rc = ipmi_mc_get_selftest(intf);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
lprintf(LOG_ERR, "Invalid mc/bmc command: %s", argv[0]);
|
||||||
|
rc = -1;
|
||||||
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -845,6 +845,7 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
// PEF subcommand handling
|
// PEF subcommand handling
|
||||||
*/
|
*/
|
||||||
int help = 0;
|
int help = 0;
|
||||||
|
int rc = 0;
|
||||||
|
|
||||||
if (!argc || !strncmp(argv[0], "info", 4))
|
if (!argc || !strncmp(argv[0], "info", 4))
|
||||||
ipmi_pef_get_info(intf);
|
ipmi_pef_get_info(intf);
|
||||||
@ -858,11 +859,14 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
ipmi_pef_list_entries(intf);
|
ipmi_pef_list_entries(intf);
|
||||||
else {
|
else {
|
||||||
help = 1;
|
help = 1;
|
||||||
|
rc = -1;
|
||||||
lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
|
lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (help)
|
if (help)
|
||||||
lprintf(LOG_NOTICE, "PEF commands: info status policy list");
|
lprintf(LOG_NOTICE, "PEF commands: info status policy list");
|
||||||
else if (!verbose)
|
else if (!verbose)
|
||||||
printf("\n");
|
printf("\n");
|
||||||
return 0;
|
|
||||||
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -815,12 +815,13 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
0); /* This field is ignored */
|
0); /* This field is ignored */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
retval = -1;
|
||||||
|
lprintf(LOG_ERR, "Invalid user command: '%s'\n", argv[0]);
|
||||||
print_user_usage();
|
print_user_usage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user