Check HAVE_COPY_FILE_RANGE before calling copy_file_range

tvondra · tvondra · commit 079d94ab3412 · 2024-04-05T19:38:20.000+02:00
Fix a mistake in ac81101 - write_reconstructed_file() called copy_file_range() without properly checking HAVE_COPY_FILE_RANGE. Reported by several macOS machines. Also reported by cfbot, but I missed that issue before commit.
diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c
@@ -672,6 +672,7 @@ write_reconstructed_file(char *input_filename,
 		}
 		else					/* use copy_file_range */
 		{
+#if defined(HAVE_COPY_FILE_RANGE)
 			/* copy_file_range modifies the offset, so use a local copy */
 			off_t		off = offsetmap[i];
 			size_t		nwritten = 0;
@@ -706,6 +707,9 @@ write_reconstructed_file(char *input_filename,
 			if (pg_checksum_update(checksum_ctx, buffer, BLCKSZ) < 0)
 				pg_fatal("could not update checksum of file \"%s\"",
 						 output_filename);
+#else
+			pg_fatal("copy_file_range not supported on this platform");
+#endif
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,7 @@ write_reconstructed_file(char *input_filename,`
`672`	`672`	`}`
`673`	`673`	`else /* use copy_file_range */`
`674`	`674`	`{`
	`675`	`+#if defined(HAVE_COPY_FILE_RANGE)`
`675`	`676`	`/* copy_file_range modifies the offset, so use a local copy */`
`676`	`677`	`off_t off = offsetmap[i];`
`677`	`678`	`size_t nwritten = 0;`
`@@ -706,6 +707,9 @@ write_reconstructed_file(char *input_filename,`
`706`	`707`	`if (pg_checksum_update(checksum_ctx, buffer, BLCKSZ) < 0)`
`707`	`708`	`pg_fatal("could not update checksum of file \"%s\"",`
`708`	`709`	`output_filename);`
	`710`	`+#else`
	`711`	`+ pg_fatal("copy_file_range not supported on this platform");`
	`712`	`+#endif`
`709`	`713`	`}`
`710`	`714`	`}`
`711`	`715`