Commit025106e

committed

pg_upgrade: properly detect file copy failure on Windows

Previously, file copy failures were ignored on Windows due to anincorrect return value check.Report by Manu JoyeBackpatch through 9.1

1 parent42aa1c0 commit025106eCopy full SHA for 025106e

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 1 deletion

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

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ extern char *output_files[];`
`70`	`70`
`71`	`71`
`72`	`72`	`#ifndefWIN32`
`73`		`-#definepg_copy_filecopy_file`
`74`	`73`	`#definepg_mv_filerename`
`75`	`74`	`#definepg_link_filelink`
`76`	`75`	`#definePATH_SEPARATOR'/'`
`@@ -82,7 +81,6 @@ extern char *output_files[];`
`82`	`81`	`#defineECHO_QUOTE"'"`
`83`	`82`	`#defineECHO_BLANK""`
`84`	`83`	`#else`
`85`		`-#definepg_copy_fileCopyFile`
`86`	`84`	`#definepg_mv_filepgrename`
`87`	`85`	`#definepg_link_filewin32_pghardlink`
`88`	`86`	`#definePATH_SEPARATOR'\\'`

Comments

(0)