From 073420d30563407f336e28e3df4eacd020e838b5 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 24 Jan 2025 18:10:17 +0000
Subject: [PATCH] util/nvmutil: cleaner argument handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 util/nvmutil/nvmutil.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index 7fbf1664..c3d242d8 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -127,10 +127,12 @@ main(int argc, char *argv[])
 	err_if(pledge("stdio", NULL) == -1);
 #endif
 
-	for (int i = 0; i < 6; i++) /* detect user-supplied command */
-		if (strcmp(COMMAND, op[i].str) == 0)
-			if ((cmd = argc >= op[i].args ? op[i].cmd : NULL))
-				break;
+	for (int i = 0; (i < 6) && (cmd == NULL); i++) {
+		if (strcmp(COMMAND, op[i].str) != 0)
+			continue;
+		if (argc >= op[i].args)
+			cmd = op[i].cmd;
+	}
 
 	if (cmd == cmd_setmac) {
 		strMac = strRMac; /* random MAC */