Cleaned up some text, handled -R.

Signed-off-by: Rich Ercolani <[email protected]>

Author: rincebrain

cmd/zfs/zfs_main.c

@@ -727,23 +727,30 @@ finish_progress(char *done)
 	pt_header = NULL;
 }
 
+// This function checks if the passed fd refers to /dev/null or /dev/zero
 static int
-is_dev_fs(int fd)
+is_dev_files(int fd)
 {
 	int nfd = open("/dev/null", O_WRONLY);
 	struct stat st, nst;
 	fstat(fd, &st);
 	fstat(nfd, &nst);
 	int res = (st.st_dev == nst.st_dev);
 	close(nfd);
+	if (res != 1) {
+		nfd = open("/dev/zero", O_WRONLY);
+		fstat(nfd, &nst);
+		res = (st.st_dev == nst.st_dev);
+		close(nfd);
+	}
 	return (res);
 }
 
 static int
 is_dev_error(int err, int fd)
 {
 #ifdef __linux__
-	if (err == EINVAL && is_dev_fs(fd)) {
+	if (err == EINVAL && is_dev_files(fd)) {
 		return (1);
 	}
 #endif
@@ -4596,8 +4603,8 @@ zfs_do_send(int argc, char **argv)
 		    resume_token);
 		if (err != 0 && is_dev_error(errno, STDOUT_FILENO)) {
 			(void) fprintf(stderr,
-			    gettext("Error: Stream cannot be written to /dev/"
-			    " files.\n"));
+			    gettext("Error: Stream cannot be written to "
+			    "/dev/{null,zero} files.\n"));
 
 		}
 		zfs_close(zhp);
@@ -4607,8 +4614,8 @@ zfs_do_send(int argc, char **argv)
 		    resume_token);
 		if (err != 0 && is_dev_error(errno, STDOUT_FILENO)) {
 			(void) fprintf(stderr,
-			    gettext("Error: Stream cannot be written to /dev/"
-			    " files.\n"));
+			    gettext("Error: Stream cannot be written to "
+			    "/dev/{null,zero} files.\n"));
 		}
 		return (err);
 	}
@@ -4663,8 +4670,8 @@ zfs_do_send(int argc, char **argv)
 		zfs_close(zhp);
 		if (err != 0 && is_dev_error(errno, STDOUT_FILENO)) {
 			(void) fprintf(stderr,
-			    gettext("Error: Stream cannot be written to /dev/"
-			    " files.\n"));
+			    gettext("Error: Stream cannot be written to "
+			    "/dev/{null,zero} files.\n"));
 		}
 		return (err != 0);
 	}
@@ -4742,10 +4749,10 @@ zfs_do_send(int argc, char **argv)
 		nvlist_free(dbgnv);
 	}
 	zfs_close(zhp);
-	if (err != 0 && is_dev_error(errno, STDOUT_FILENO)) {
+	if (is_dev_error(errno, STDOUT_FILENO)) {
 		(void) fprintf(stderr,
-		    gettext("Error: Stream cannot be written to /dev/ "
-		    "files.\n"));
+		    gettext("Error: Stream cannot be written to "
+		    "/dev/{null,zero} files.\n"));
 	}
 
 	return (err != 0);

lib/libzfs/libzfs_sendrecv.c

@@ -849,6 +849,7 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, uint64_t fromsnap_obj,
 		case ERANGE:
 		case EFAULT:
 		case EROFS:
+		case EINVAL:
 			zfs_error_aux(hdl, strerror(errno));
 			return (zfs_error(hdl, EZFS_BADBACKUP, errbuf));