deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "help" command line processing in fru command defect (ID: 3610117)

Browse Source 
introduced by the following changes:

ID: 3582307 - 'lib/ipmi_fru.c' - ipmi_fru_main() return codes
ID: 3582310 - 'lib/ipmi_fru.c' - ipmi_fru_main() - misuse of printf()
This commit is contained in:
Jim Mankovich 2013-04-08 13:22:34 +00:00
parent 9d6a201911
commit 2dfa02ba24
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipmitool/lib/ipmi_fru.c
View File

@ -4395,7 +4395,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
} }
} }
else if (!strncmp(argv[0], "read", 5)) { else if (!strncmp(argv[0], "read", 5)) {
if (argc >= 1 && strcmp(argv[1], "help") == 0) { if (argc > 1 && strcmp(argv[1], "help") == 0) {
ipmi_fru_read_help(); ipmi_fru_read_help();
return 0; return 0;
} else if (argc < 3) { } else if (argc < 3) {
@ -4419,7 +4419,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_fru_read_to_bin(intf, argv[2], fru_id); ipmi_fru_read_to_bin(intf, argv[2], fru_id);
} }
else if (!strncmp(argv[0], "write", 5)) { else if (!strncmp(argv[0], "write", 5)) {
if (argc >= 1 && strcmp(argv[1], "help") == 0) { if (argc > 1 && strcmp(argv[1], "help") == 0) {
ipmi_fru_write_help(); ipmi_fru_write_help();
return 0; return 0;
} else if (argc < 3) { } else if (argc < 3) {
@ -4443,7 +4443,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_fru_write_from_bin(intf, argv[2], fru_id); ipmi_fru_write_from_bin(intf, argv[2], fru_id);
} }
else if (!strncmp(argv[0], "upgEkey", 7)) { else if (!strncmp(argv[0], "upgEkey", 7)) {
if (argc >= 1 && strcmp(argv[1], "help") == 0) { if (argc > 1 && strcmp(argv[1], "help") == 0) {
ipmi_fru_upgekey_help(); ipmi_fru_upgekey_help();
return 0; return 0;
} else if (argc < 3) { } else if (argc < 3) {
@ -4462,7 +4462,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = ipmi_fru_upg_ekeying(intf, argv[2], fru_id); rc = ipmi_fru_upg_ekeying(intf, argv[2], fru_id);
} }
else if (!strncmp(argv[0], "internaluse", 11)) { else if (!strncmp(argv[0], "internaluse", 11)) {
if (argc >= 1 && strcmp(argv[1], "help") == 0) { if (argc > 1 && strcmp(argv[1], "help") == 0) {
ipmi_fru_internaluse_help(); ipmi_fru_internaluse_help();
return 0; return 0;
} }
@ -4516,7 +4516,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
} }
} }
else if (!strncmp(argv[0], "edit", 4)) { else if (!strncmp(argv[0], "edit", 4)) {
if (argc >= 1 && strcmp(argv[1], "help") == 0) { if (argc > 1 && strcmp(argv[1], "help") == 0) {
ipmi_fru_edit_help(); ipmi_fru_edit_help();
return 0; return 0;
} else if (argc < 2) { } else if (argc < 2) {
@ -4557,7 +4557,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
} }
} }
else if (!strncmp(argv[0], "get", 4)) { else if (!strncmp(argv[0], "get", 4)) {
if (argc >= 1 && (strncmp(argv[1], "help", 4) == 0)) { if (argc > 1 && (strncmp(argv[1], "help", 4) == 0)) {
ipmi_fru_get_help(); ipmi_fru_get_help();
return 0; return 0;
} else if (argc < 2) { } else if (argc < 2) {