diff options
| author | Bruce Momjian <bruce@momjian.us> | 2015-11-14 11:47:11 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2015-11-14 11:47:11 -0500 |
| commit | 87cdfeb18ae0fe298b6f405718cbe97eaed190d3 (patch) | |
| tree | 52dd582acfe0dc3b4a6d3f2cef0799245dbc83e6 /contrib/pg_upgrade/file.c | |
| parent | 40879a92b90cdd46f74588a2edb024a3c869d932 (diff) | |
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
Diffstat (limited to 'contrib/pg_upgrade/file.c')
| -rw-r--r-- | contrib/pg_upgrade/file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index ab9d1edcb6d..4d2c407084c 100644 --- 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; |