NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6638c9a

committed

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

Also fix getErrorText() to return the right error string on failure.This behavior now matches that of other operating systems.Report by Noah MischBackpatch through 9.1

1 parent0e61852 commit6638c9aCopy full SHA for 6638c9a

File tree

2 files changed

-1

lines changed

contrib/pg_upgrade
- file.c
- util.c

2 files changed

-1

lines changed

`‎contrib/pg_upgrade/file.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ copyAndUpdateFile(pageCnvCtx *pageConverter,`
`37`	`37`	`#ifndefWIN32`
`38`	`38`	`if (copy_file(src,dst,force)==-1)`
`39`	`39`	`#else`
`40`		`-if (CopyFile(src,dst,force)==0)`
	`40`	`+if (CopyFile(src,dst,!force)==0)`
`41`	`41`	`#endif`
`42`	`42`	`returngetErrorText(errno);`
`43`	`43`	`else`

`‎contrib/pg_upgrade/util.c`

Lines changed: 2 additions & 0 deletions

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

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6638c9a

File tree

2 files changed

2 files changed

`‎contrib/pg_upgrade/file.c`

`‎contrib/pg_upgrade/util.c`

0 commit comments