d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exit when we can't print a variable.

Browse Source 
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
This commit is contained in:
Warner Losh 2017-02-25 00:09:26 +00:00
parent 589c673b32
commit 35a419a2cb
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/efivar/efivar.c
View File

@ -205,21 +205,20 @@ print_var(efi_guid_t *guid, char *name)
int rv; int rv;
efi_guid_to_str(guid, &gname); efi_guid_to_str(guid, &gname);
if (!Nflag)
printf("%s-%s", gname, name);
if (pflag) { if (pflag) {
rv = efi_get_variable(*guid, name, &data, &datalen, &att); rv = efi_get_variable(*guid, name, &data, &datalen, &att);
if (rv < 0) if (rv < 0)
printf("\n --- Error getting value --- %d", errno); err(1, "%s-%s", gname, name);
else {
if (Aflag) if (!Nflag)
asciidump(data, datalen); printf("%s-%s", gname, name);
else if (bflag) if (Aflag)
bindump(data, datalen); asciidump(data, datalen);
else else if (bflag)
hexdump(data, datalen); bindump(data, datalen);
} else
hexdump(data, datalen);
} }
free(gname); free(gname);
if (!Nflag) if (!Nflag)