Date: Sat, 9 Dec 2017 07:44:00 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326728 - head/usr.sbin/efibootmgr Message-ID: <201712090744.vB97i0YV093256@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Dec 9 07:44:00 2017 New Revision: 326728 URL: https://svnweb.freebsd.org/changeset/base/326728 Log: Indent multiple device path entries correctly. Sponsored by: Netflix Modified: head/usr.sbin/efibootmgr/efibootmgr.c Modified: head/usr.sbin/efibootmgr/efibootmgr.c ============================================================================== --- head/usr.sbin/efibootmgr/efibootmgr.c Sat Dec 9 07:43:55 2017 (r326727) +++ head/usr.sbin/efibootmgr/efibootmgr.c Sat Dec 9 07:44:00 2017 (r326728) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712090744.vB97i0YV093256>