diff options
| author | Allan Jude <[email protected]> | 2017-10-31 21:41:46 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-01-19 09:36:17 -0800 |
| commit | 6bc4a2376c694f813d2ee78af3d749aa2684f391 (patch) | |
| tree | 8e9f2f984191d07ec199bbca2b90afa18772cde1 | |
| parent | 916384729e5d828e578c8f5c3003742360fb89ea (diff) | |
OpenZFS 8972 - zfs holds: In scripted mode, do not pad columns with spaces
Authored by: Allan Jude <[email protected]>
Approved by: Dan McDonald <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: George Melikov <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/8972
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/3aace5c077
Closes #7063
| -rw-r--r-- | cmd/zfs/zfs_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 26096e115..924a4d4aa 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -5749,8 +5749,6 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl) uint64_t val = 0; time_t time; struct tm t; - char sep = scripted ? '\t' : ' '; - int sepnum = scripted ? 1 : 2; (void) nvpair_value_uint64(nvp2, &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, 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); + } } } } |