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/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index ab9d1edcb6d86f26efb9d018ce8848403fd3e8a6..4d2c407084c7a3ad65dc4b068f62c88c14f87c50 100644 (file)
--- 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
index 1c6f8f0aa1c241fab5eb9e175abd437df94daef0..5568c2ebbab911c720dd84b782a649b0b5ecc424 100644 (file)
--- 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         '\\'