pg_upgrade: properly detect file copy failure on Windows

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/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index 79d9390216ed34e10191b143770fbc4393fe8972..37eb832c93a01d8d3a2ee40c35d634590dd78189 100644 (file)
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/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/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 13aa891d59d9ab93161a9790dafa26d30218c8e6..fa4661b7d6a6b3dda16818c764ef743a7cfc4487 100644 (file)
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/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         '/'
@@ -82,7 +81,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         '\\'