From 2dfa02ba247c9a5e4d333cbd7b4416a91945285a Mon Sep 17 00:00:00 2001
From: Jim Mankovich <jmank@hp.com>
Date: Mon, 8 Apr 2013 13:22:34 +0000
Subject: [PATCH] Fix "help" command line processing in fru command defect (ID:
 3610117) 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()
---
 ipmitool/lib/ipmi_fru.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ipmitool/lib/ipmi_fru.c b/ipmitool/lib/ipmi_fru.c
index 7177b3a..90da15b 100644
--- a/ipmitool/lib/ipmi_fru.c
+++ b/ipmitool/lib/ipmi_fru.c
@@ -4395,7 +4395,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
 		}
 	}
 	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();
 			return 0;
 		} 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);
 	}
 	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();
 			return 0;
 		} 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);
 	}
 	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();
 			return 0;
 		} 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);
 	}
 	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();
 			return 0;
 		}
@@ -4516,7 +4516,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
 		}
 	}
 	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();
 			return 0;
 		} 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)) {
-		if (argc >= 1 && (strncmp(argv[1], "help", 4) == 0)) {
+		if (argc > 1 && (strncmp(argv[1], "help", 4) == 0)) {
 			ipmi_fru_get_help();
 			return 0;
 		} else if (argc < 2) {