pg_upgrade: properly detect file copy failure on Windows

bmomjian · bmomjian · commit 87cdfeb18ae0 · 2015-11-14T11:47:11.000-05:00
Previously, file copy failures were ignored on Windows due to an
incorrect return value check.

Report by Manu Joye

Backpatch through 9.1
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -34,7 +34,11 @@ copyAndUpdateFile(pageCnvCtx *pageConverter,
 {
 	if (pageConverter == NULL)
 	{
-		if (pg_copy_file(src, dst, force) == -1)
+#ifndef WIN32
+		if (copy_file(src, dst, force) == -1)
+#else
+		if (CopyFile(src, dst, force) == 0)
+#endif
 			return getErrorText(errno);
 		else
 			return NULL;
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
@@ -70,7 +70,6 @@ extern char *output_files[];
 
 
 #ifndef WIN32
-#define pg_copy_file		copy_file
 #define pg_mv_file			rename
 #define pg_link_file		link
 #define PATH_SEPARATOR		'/'
@@ -80,7 +79,6 @@ extern char *output_files[];
 #define ECHO_QUOTE	"'"
 #define ECHO_BLANK	""
 #else
-#define pg_copy_file		CopyFile
 #define pg_mv_file			pgrename
 #define pg_link_file		win32_pghardlink
 #define PATH_SEPARATOR		'\\'

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,11 @@ copyAndUpdateFile(pageCnvCtx *pageConverter,`
`34`	`34`	`{`
`35`	`35`	`if (pageConverter == NULL)`
`36`	`36`	`{`
`37`		`- if (pg_copy_file(src, dst, force) == -1)`
	`37`	`+#ifndef WIN32`
	`38`	`+ if (copy_file(src, dst, force) == -1)`
	`39`	`+#else`
	`40`	`+ if (CopyFile(src, dst, force) == 0)`
	`41`	`+#endif`
`38`	`42`	`return getErrorText(errno);`
`39`	`43`	`else`
`40`	`44`	`return NULL;`