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

MFV r328255: 8972 zfs holds: In scripted mode, do not pad columns with spaces

Browse Source 
illumos/illumos-gate@e9b7d6e7f7

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>
This commit is contained in:
Alexander Motin 2018-01-22 06:00:45 +00:00
commit 0d6993dfd3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=328256
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
View File

@ -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);
}
}
}
}