summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-04-12 20:31:33 +0000
committerpjd <pjd@FreeBSD.org>2011-04-12 20:31:33 +0000
commitdc444615c90beb3886a0201e6db1663b95388eea (patch)
treede4b5b68d511d1d4f8f20938865752cab744a1b5 /cddl
parent205b535d3e5cf7fefc69336d661902202d34d3f3 (diff)
downloadFreeBSD-src-dc444615c90beb3886a0201e6db1663b95388eea.zip
FreeBSD-src-dc444615c90beb3886a0201e6db1663b95388eea.tar.gz
Fix 'zfs list <path>' handling. If the path was found, the 'ret' variable was
uninitialized. PR: kern/155940 Submitted by: KOIE Hidetaka <koie@suri.co.jp> MFC after: 1 week
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
index 01738fb..e457a23 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
@@ -734,12 +734,13 @@ zfs_path_to_zhandle(libzfs_handle_t *hdl, char *path, zfs_type_t argtype)
{
struct statfs sfs;
- if (statfs(path, &sfs) != 0) {
+ ret = statfs(path, &sfs);
+ if (ret == 0)
+ statfs2mnttab(&sfs, &entry);
+ else {
(void) fprintf(stderr, "%s: %s\n", path,
strerror(errno));
- ret = -1;
}
- statfs2mnttab(&sfs, &entry);
}
#endif /* sun */
if (ret != 0) {
OpenPOWER on IntegriCloud