From a13047440aeda52874854f5d5ad226ddd83f5eab Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Thu, 19 May 2016 16:36:06 +0000
Subject: [PATCH] Fix logic error so UEFI variables are reported correctly
 without error at the end.

---
 sys/boot/efi/loader/main.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index 5efe6311abdf..d2cba45a2dfd 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -891,24 +891,26 @@ command_efi_printenv(int argc, char *argv[])
 	 */
 	varsz = nitems(varname);
 	varname[0] = 0;
-	status = RS->GetNextVariableName(&varsz, varname, &varguid);
-	while (status != EFI_NOT_FOUND) {
-		status = RS->GetNextVariableName(&varsz, varname,
-		    &varguid);
+	while ((status = RS->GetNextVariableName(&varsz, varname, &varguid)) !=
+	    EFI_NOT_FOUND) {
 		if (aflag) {
 			if (efi_print_var(varname, &varguid, lflag) != CMD_OK)
 				break;
 			continue;
 		}
 		if (vflag) {
-			if (wcscmp(varnamearg, varname) == 0)
+			if (wcscmp(varnamearg, varname) == 0) {
 				if (efi_print_var(varname, &varguid, lflag) != CMD_OK)
 					break;
+				continue;
+			}
 		}
 		if (gflag) {
-			if (memcmp(&varguid, &matchguid, sizeof(varguid)) == 0)
+			if (memcmp(&varguid, &matchguid, sizeof(varguid)) == 0) {
 				if (efi_print_var(varname, &varguid, lflag) != CMD_OK)
 					break;
+				continue;
+			}
 		}
 	}
 	pager_close();