D44756.diff
No OneTemporary
Actions

Size

777 B

Referenced Files

None

Subscribers

None

D44756.diff
View Options

	diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
	--- a/usr.bin/xinstall/xinstall.c
	+++ b/usr.bin/xinstall/xinstall.c
	@@ -1232,15 +1232,12 @@
	#ifndef BOOTSTRAP_XINSTALL
	/* Try copy_file_range() if no digest is requested */
	if (digesttype == DIGEST_NONE) {
	- ret = 1;
	- while (ret > 0) {
	+ do {
	ret = copy_file_range(from_fd, NULL, to_fd, NULL,
	SSIZE_MAX, 0);
	- }
	- if (ret == 0) {
	- /* DIGEST_NONE always returns NULL */
	- return (NULL);
	- }
	+ } while (ret > 0);
	+ if (ret == 0)
	+ goto done;
	if (errno != EINVAL) {
	serrno = errno;
	(void)unlink(to_name);
	@@ -1313,6 +1310,7 @@
	err(EX_OSERR, "%s", from_name);
	}
	}
	+done:
	if (safecopy && fsync(to_fd) == -1) {
	serrno = errno;
	(void)unlink(to_name);