port zfs send -R

use WriteFile instead of write in libzfs_sendrecv.c
openzfsonwindows · Mar 5, 2019 · 25f8a67 · 25f8a67
1 parent d07aab9
commit 25f8a67
Showing 1 changed file with 32 additions and 1 deletion.
diff --git a/ZFSin/zfs/lib/libzfs/libzfs_sendrecv.c b/ZFSin/zfs/lib/libzfs/libzfs_sendrecv.c
@@ -214,12 +214,27 @@ dump_record(dmu_replay_record_t *drr, void *payload, int payload_len,
 	}
 	(void) fletcher_4_incremental_native(
 	    &drr->drr_u.drr_checksum.drr_checksum, sizeof (zio_cksum_t), zc);
+
+#ifdef WIN32
+	DWORD byteswritten = 0;
+	if (!WriteFile(outfd, &drr, sizeof(drr), &byteswritten, NULL)) {
+		return (GetLastError());
+	}
+#else
 	if (write(outfd, drr, sizeof (*drr)) == -1)
 		return (errno);
+#endif
 	if (payload_len != 0) {
 		(void) fletcher_4_incremental_native(payload, payload_len, zc);
+#ifdef WIN32
+		byteswritten = 0;
+		if (!WriteFile(outfd, &drr, sizeof(drr), &byteswritten, NULL)) {
+			return (GetLastError());
+		}
+#else
 		if (write(outfd, payload, payload_len) == -1)
 			return (errno);
+#endif
 	}
 	return (0);
 }
@@ -1423,7 +1438,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
 		}
 
 		err = dump_ioctl(zhp, sdd->prevsnap, sdd->prevsnap_obj,
-		    fromorigin, sdd->outfd, flags, sdd->debugnv);
+			fromorigin, sdd->outfd, flags, sdd->debugnv);
 
 		if (sdd->progress) {
 			(void) pthread_cancel(tid);
@@ -1987,11 +2002,19 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
 			bzero(&drr, sizeof (drr));
 			drr.drr_type = DRR_END;
 			drr.drr_u.drr_end.drr_checksum = zc;
+#ifdef WIN32
+			DWORD byteswritten;
+			if (!WriteFile(outfd, &drr, sizeof(drr), &byteswritten, NULL)) {
+				err = GetLastError();
+				goto stderr_out;
+			}
+#else
 			err = write(outfd, &drr, sizeof (drr));
 			if (err == -1) {
 				err = errno;
 				goto stderr_out;
 			}
+#endif
 
 			err = 0;
 		}
@@ -2135,10 +2158,18 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
 		 */
 		dmu_replay_record_t drr = { 0 };
 		drr.drr_type = DRR_END;
+#ifdef WIN32
+		DWORD byteswritten = 0;
+		if (!WriteFile(outfd, &drr, sizeof(drr), &byteswritten, NULL)) {
+			return (zfs_standard_error(zhp->zfs_hdl,
+				GetLastError(), errbuf));
+		}
+#else
 		if (write(outfd, &drr, sizeof (drr)) == -1) {
 			return (zfs_standard_error(zhp->zfs_hdl,
 			    errno, errbuf));
 		}
+#endif
 	}
 
 	return (err || sdd.err);