Author: mm
Date: Sun May 27 12:22:15 2012
New Revision: 236145
URL: http://svn.freebsd.org/changeset/base/236145

Log:
  Import illumos changeset 13564:cf89c0c60496
  1946 incorrect formatting when listing output of multiple pools with
  zpool iostat -v
  
  References:
  https://www.illumos.org/issues/1946
  
  Obtained from:        illumos (issue #1946)
  MFC after:    1 week

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c        Sun May 27 
12:01:04 2012        (r236144)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c        Sun May 27 
12:22:15 2012        (r236145)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2011 Martin Matuska <m...@freebsd.org>. All rights reserved.
  */
 
@@ -2351,7 +2352,8 @@ get_namewidth(zpool_handle_t *zhp, void 
                if (!cb->cb_verbose)
                        cb->cb_namewidth = strlen(zpool_get_name(zhp));
                else
-                       cb->cb_namewidth = max_width(zhp, nvroot, 0, 0);
+                       cb->cb_namewidth = max_width(zhp, nvroot, 0,
+                           cb->cb_namewidth);
        }
 
        /*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to