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

OpenZFS 8972 - zfs holds: In scripted mode, do not pad columns with spaces

Browse Source 
Authored by: Allan Jude <allanjude@freebsd.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Melikov <mail@gmelikov.ru>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>

OpenZFS-issue: https://www.illumos.org/issues/8972
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/3aace5c077
Closes #7063
This commit is contained in:
Allan Jude 2017-10-31 21:41:46 -04:00 committed by Brian Behlendorf
parent 916384729e
commit 6bc4a2376c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/zfs/zfs_main.c
View File

@ -5749,8 +5749,6 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl)
uint64_t val = 0; uint64_t val = 0;
time_t time; time_t time;
struct tm t; struct tm t;
char sep = scripted ? '\t' : ' ';
int sepnum = scripted ? 1 : 2;
(void) nvpair_value_uint64(nvp2, &val); (void) nvpair_value_uint64(nvp2, &val);
time = (time_t)val; time = (time_t)val;
@ -5758,8 +5756,13 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl)
(void) strftime(tsbuf, DATETIME_BUF_LEN, (void) strftime(tsbuf, DATETIME_BUF_LEN,
gettext(STRFTIME_FMT_STR), &t); gettext(STRFTIME_FMT_STR), &t);
(void) printf("%-*s%*c%-*s%*c%s\n", nwidth, zname, if (scripted) {
sepnum, sep, tagwidth, tagname, sepnum, sep, tsbuf); (void) printf("%s\t%s\t%s\n", zname,
tagname, tsbuf);
} else {
(void) printf("%-*s %-*s %s\n", nwidth,
zname, tagwidth, tagname, tsbuf);
}
} }
} }
} }