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

Indent multiple device path entries correctly.

Browse Source 
Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-12-09 07:44:00 +00:00
parent 1127aea3e7
commit a2aa66719e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/efibootmgr/efibootmgr.c
View File

@ -704,6 +704,7 @@ print_loadopt_str(uint8_t *data, size_t datalen)
int len;
int optlen;
int rv;
int indent;
if (datalen < sizeof(attr) + sizeof(fplen) + sizeof(efi_char))
return;
@ -729,13 +730,15 @@ print_loadopt_str(uint8_t *data, size_t datalen)
opt = walker;
optlen = ep - walker;
indent = 1;
while (dp < edp) {
efidp_format_device_path(buf, sizeof(buf), dp,
(intptr_t)(void *)edp - (intptr_t)(void *)dp);
printf(" %s\n", buf);
printf("%*s%s\n", indent, "", buf);
indent = 10 + len + 1;
rv = efivar_device_path_to_unix_path(dp, &dev, &relpath, &abspath);
if (rv == 0) {
printf(" %s:%s %s\n", dev, relpath, abspath);
printf("%*s%s:%s %s\n", indent + 4, "", dev, relpath, abspath);
free(dev);
free(relpath);
free(abspath);