pg_upgrade: fix CopyFile() on Windows to fail on file existence

bmomjian · bmomjian · commit 6638c9aaf881 · 2015-11-24T17:18:27.000-05:00
Also fix getErrorText() to return the right error string on failure.
This behavior now matches that of other operating systems.

Report by Noah Misch

Backpatch through 9.1
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
@@ -37,7 +37,7 @@ copyAndUpdateFile(pageCnvCtx *pageConverter,
 #ifndef WIN32
 		if (copy_file(src, dst, force) == -1)
 #else
-		if (CopyFile(src, dst, force) == 0)
+		if (CopyFile(src, dst, !force) == 0)
 #endif
 			return getErrorText(errno);
 		else
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
@@ -226,6 +226,8 @@ getErrorText(int errNum)
 {
 #ifdef WIN32
 	_dosmaperr(GetLastError());
+	/* _dosmaperr sets errno, so we copy errno here */
+	errNum = errno;
 #endif
 	return pg_strdup(strerror(errNum));
 }

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,8 @@ getErrorText(int errNum)`
`226`	`226`	`{`
`227`	`227`	`#ifdef WIN32`
`228`	`228`	`_dosmaperr(GetLastError());`
	`229`	`+ /* _dosmaperr sets errno, so we copy errno here */`
	`230`	`+ errNum = errno;`
`229`	`231`	`#endif`
`230`	`232`	`return pg_strdup(strerror(errNum));`
`231`	`233`	`}`