svn commit: r329495 - stable/11/cddl/contrib/opensolaris/cmd/zfs

[Alexander Motin]

Author: mav
Date: Sun Feb 18 00:27:35 2018
New Revision: 329495
URL: https://svnweb.freebsd.org/changeset/base/329495

Log:
  MFC r328256:
  MFV r328255: 8972 zfs holds: In scripted mode, do not pad columns with spaces
  
  illumos/illumos-gate at 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 at delphix.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: Allan Jude <allanjude at freebsd.org>

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 18 00:26:34 2018	(r329494)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Feb 18 00:27:35 2018	(r329495)
@@ -5636,8 +5636,6 @@ print_holds(boolean_t scripted, boolean_t literal, siz
 			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, siz
 				    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);
+			}
 		}
 	}
 }