From 35a419a2cbdc36148de9d6211f1e2051cc2138a1 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 25 Feb 2017 00:09:26 +0000 Subject: [PATCH] Exit when we can't print a variable. Exit after printing a message on stderr when we can't get a message. This is slightly different than linux, but keeps shell scripts from thinking the value of the variable is the error message and so is a net win. Sponsored by: Netflix --- usr.sbin/efivar/efivar.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c index 994cc8dfb19e..7801b926978d 100644 --- a/usr.sbin/efivar/efivar.c +++ b/usr.sbin/efivar/efivar.c @@ -205,21 +205,20 @@ print_var(efi_guid_t *guid, char *name) int rv; efi_guid_to_str(guid, &gname); - if (!Nflag) - printf("%s-%s", gname, name); if (pflag) { rv = efi_get_variable(*guid, name, &data, &datalen, &att); if (rv < 0) - printf("\n --- Error getting value --- %d", errno); - else { - if (Aflag) - asciidump(data, datalen); - else if (bflag) - bindump(data, datalen); - else - hexdump(data, datalen); - } + err(1, "%s-%s", gname, name); + + if (!Nflag) + printf("%s-%s", gname, name); + if (Aflag) + asciidump(data, datalen); + else if (bflag) + bindump(data, datalen); + else + hexdump(data, datalen); } free(gname); if (!Nflag)