git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #1946: incorrect formatting when listing output of multiple pools with zpool...
[zfs.git]
/
cmd
/
zpool
/
zpool_main.c
diff --git
a/cmd/zpool/zpool_main.c
b/cmd/zpool/zpool_main.c
index
a6c5a47
..
bc91771
100644
(file)
--- a/
cmd/zpool/zpool_main.c
+++ b/
cmd/zpool/zpool_main.c
@@
-21,6
+21,9
@@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
/*
* 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.
*/
#include <assert.h>
*/
#include <assert.h>
@@
-2236,7
+2239,8
@@
get_namewidth(zpool_handle_t *zhp, void *data)
if (!cb->cb_verbose)
cb->cb_namewidth = strlen(zpool_get_name(zhp));
else
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);
}
/*
}
/*