X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibzfs%2Flibzfs_util.c;h=5f6763c49010ae2c126b55a82d0c4834954f2543;hb=a38718a63d79116d6cb614dd2821e2a3955e5c8c;hp=da1b9bcddf8214464cfe2fde76ad27da061dfe26;hpb=9ac97c2a939aef0f9899244920007c605387949a;p=zfs.git

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index da1b9bc..5f6763c 100644
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -635,15 +635,22 @@ int
 libzfs_run_process(const char *path, char *argv[], int flags)
 {
 	pid_t pid;
-	int rc;
+	int rc, devnull_fd;
 
 	pid = vfork();
 	if (pid == 0) {
+		devnull_fd = open("/dev/null", O_WRONLY);
+
+		if (devnull_fd < 0)
+			_exit(-1);
+
 		if (!(flags & STDOUT_VERBOSE))
-			close(STDOUT_FILENO);
+			(void) dup2(devnull_fd, STDOUT_FILENO);
 
 		if (!(flags & STDERR_VERBOSE))
-			close(STDERR_FILENO);
+			(void) dup2(devnull_fd, STDERR_FILENO);
+
+		close(devnull_fd);
 
 		(void) execvp(path, argv);
 		_exit(-1);
@@ -1186,11 +1193,14 @@ str2shift(libzfs_handle_t *hdl, const char *buf)
 	}
 
 	/*
-	 * We want to allow trailing 'b' characters for 'GB' or 'Mb'.  But don't
-	 * allow 'BB' - that's just weird.
+	 * Allow 'G' = 'GB' = 'GiB', case-insensitively.
+	 * However, 'BB' and 'BiB' are disallowed.
 	 */
-	if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0' &&
-	    toupper(buf[0]) != 'B'))
+	if (buf[1] == '\0' ||
+	    (toupper(buf[0]) != 'B' &&
+	     ((toupper(buf[1]) == 'B' && buf[2] == '\0') ||
+	      (toupper(buf[1]) == 'I' && toupper(buf[2]) == 'B' &&
+	       buf[3] == '\0'))))
 		return (10*i);
 
 	zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,