X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzfs%2Fzfs_main.c;h=b0e6180eac86176715e1ea25890dbd4f83acfb1a;hb=4682b8c14efdeae26808195422a763b896fef037;hp=ebcec2d6e26d7bd3b263a251fcdcaa112c7efe3d;hpb=d603ed6c278f9c25b17ba8e75e9bce6e5d715ac0;p=zfs.git

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index ebcec2d..b0e6180 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -4102,17 +4102,6 @@ main(int argc, char **argv)
 
 	opterr = 0;
 
-	if ((g_zfs = libzfs_init()) == NULL) {
-		(void) fprintf(stderr, gettext("internal error: failed to "
-		    "initialize ZFS library\n"));
-		return (1);
-	}
-
-	zpool_set_history_str("zfs", argc, argv, history_str);
-	verify(zpool_stage_history(g_zfs, history_str) == 0);
-
-	libzfs_print_on_error(g_zfs, B_TRUE);
-
 	if ((mnttab_file = fopen(MNTTAB, "r")) == NULL) {
 		(void) fprintf(stderr, gettext("internal error: unable to "
 		    "open %s\n"), MNTTAB);
@@ -4158,9 +4147,18 @@ main(int argc, char **argv)
 		/*
 		 * Special case '-?'
 		 */
-		if (strcmp(cmdname, "-?") == 0)
+		if ((strcmp(cmdname, "-?") == 0) ||
+		    (strcmp(cmdname, "--help") == 0))
 			usage(B_TRUE);
 
+		if ((g_zfs = libzfs_init()) == NULL)
+			return (1);
+
+		zpool_set_history_str("zfs", argc, argv, history_str);
+		verify(zpool_stage_history(g_zfs, history_str) == 0);
+
+		libzfs_print_on_error(g_zfs, B_TRUE);
+
 		/*
 		 * Run the appropriate command.
 		 */