diff options
| author | mav <mav@FreeBSD.org> | 2018-02-18 00:27:35 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2018-02-18 00:27:35 +0000 |
| commit | a92c40989d8d31c1b0e6090e93474ec83a29de99 (patch) | |
| tree | 5474607588162e09744b3fd66d1b4aca3352af41 /cddl/contrib/opensolaris/cmd | |
| parent | 344a371c77f063bc1563b7e9e6de0f82b18a88b3 (diff) | |
| download | FreeBSD-src-a92c40989d8d31c1b0e6090e93474ec83a29de99.zip FreeBSD-src-a92c40989d8d31c1b0e6090e93474ec83a29de99.tar.gz | |
MFC r328256:
MFV r328255: 8972 zfs holds: In scripted mode, do not pad columns with spaces
illumos/illumos-gate@e9b7d6e7f7a6477679a35b73eb3934b096b3dd39
https://www.illumos.org/issues/8972:
'zfs holds -H' does not properly output content in scripted mode. It uses a
tab instead of two spaces, but it still pads column widths with spaces when
it should not.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Allan Jude <allanjude@freebsd.org>
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index 80e5163..be4df07 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -5636,8 +5636,6 @@ print_holds(boolean_t scripted, boolean_t literal, size_t nwidth, uint64_t val = 0; time_t time; struct tm t; - char sep = scripted ? '\t' : ' '; - size_t sepnum = scripted ? 1 : 2; (void) nvpair_value_uint64(nvp2, &val); if (literal) @@ -5649,8 +5647,13 @@ print_holds(boolean_t scripted, boolean_t literal, size_t nwidth, gettext(STRFTIME_FMT_STR), &t); } - (void) printf("%-*s%*c%-*s%*c%s\n", nwidth, zname, - sepnum, sep, tagwidth, tagname, sepnum, sep, tsbuf); + if (scripted) { + (void) printf("%s\t%s\t%s\n", zname, + tagname, tsbuf); + } else { + (void) printf("%-*s %-*s %s\n", nwidth, + zname, tagwidth, tagname, tsbuf); + } } } } |
