NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit504aeea

committed

Use correct path separator for Windows builtin commands.

pg_upgrade produces a platform-specific script to remove the olddirectory, but on Windows it has not been making sure that thepaths it writes as arguments for rmdir and del use the backslashpath separator, which will cause these scripts to fail.The fix is backpatched to Release 9.0.

1 parent2a2352e commit504aeeaCopy full SHA for 504aeea

File tree

2 files changed

+42

-7

lines changed

contrib/pg_upgrade
- check.c
- pg_upgrade.h

2 files changed

+42

-7

lines changed

`‎contrib/pg_upgrade/check.c`

Lines changed: 40 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,35 @@ static void check_for_reg_data_type_usage(ClusterInfo *cluster);`
`23`	`23`	`staticvoidget_bin_version(ClusterInfo*cluster);`
`24`	`24`
`25`	`25`
	`26`	`+/*`
	`27`	`+ * fix_path_separator`
	`28`	`+ * For non-Windows, just return the argument.`
	`29`	`+ * For Windows convert any forward slash to a backslash`
	`30`	`+ * such as is suitable for arguments to builtin commands`
	`31`	`+ * like RMDIR and DEL.`
	`32`	`+ */`
	`33`	`+staticcharfix_path_separator(charpath)`
	`34`	`+{`
	`35`	`+#ifdefWIN32`
	`36`	`+`
	`37`	`+char*result;`
	`38`	`+char*c;`
	`39`	`+`
	`40`	`+result=pg_strdup(path);`
	`41`	`+`
	`42`	`+for (c=result;*c!='\0';c++)`
	`43`	`+if (*c=='/')`
	`44`	`+*c='\\';`
	`45`	`+`
	`46`	`+returnresult;`
	`47`	`+`
	`48`	`+#else`
	`49`	`+`
	`50`	`+returnpath;`
	`51`	`+`
	`52`	`+#endif`
	`53`	`+}`
	`54`	`+`
`26`	`55`	`void`
`27`	`56`	`output_check_banner(bool*live_check)`
`28`	`57`	`{`
`@@ -544,7 +573,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`544`	`573`	`#endif`
`545`	`574`
`546`	`575`	`/* delete old cluster's default tablespace */`
`547`		`-fprintf(script,RMDIR_CMD" %s\n",old_cluster.pgdata);`
	`576`	`+fprintf(script,RMDIR_CMD" %s\n",fix_path_separator(old_cluster.pgdata));`
`548`	`577`
`549`	`578`	`/* delete old cluster's alternate tablespaces */`
`550`	`579`	`for (tblnum=0;tblnum<os_info.num_tablespaces;tblnum++)`
`@@ -561,14 +590,17 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`561`	`590`	`fprintf(script,"\n");`
`562`	`591`	`/* remove PG_VERSION? */`
`563`	`592`	`if (GET_MAJOR_VERSION(old_cluster.major_version) <=804)`
`564`		`-fprintf(script,RM_CMD" %s%s/PG_VERSION\n",`
`565`		`-os_info.tablespaces[tblnum],old_cluster.tablespace_suffix);`
	`593`	`+fprintf(script,RM_CMD" %s%s%cPG_VERSION\n",`
	`594`	`+fix_path_separator(os_info.tablespaces[tblnum]),`
	`595`	`+fix_path_separator(old_cluster.tablespace_suffix),`
	`596`	`+PATH_SEPARATOR);`
`566`	`597`
`567`	`598`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`
`568`	`599`	`{`
`569`		`-fprintf(script,RMDIR_CMD" %s%s/%d\n",`
`570`		`-os_info.tablespaces[tblnum],old_cluster.tablespace_suffix,`
`571`		`-old_cluster.dbarr.dbs[dbnum].db_oid);`
	`600`	`+fprintf(script,RMDIR_CMD" %s%s%c%d\n",`
	`601`	`+fix_path_separator(os_info.tablespaces[tblnum]),`
	`602`	`+fix_path_separator(old_cluster.tablespace_suffix),`
	`603`	`+PATH_SEPARATOR,old_cluster.dbarr.dbs[dbnum].db_oid);`
`572`	`604`	`}`
`573`	`605`	`}`
`574`	`606`	`else`
`@@ -578,7 +610,8 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`578`	`610`	`* or a version-specific subdirectory.`
`579`	`611`	`*/`
`580`	`612`	`fprintf(script,RMDIR_CMD" %s%s\n",`
`581`		`-os_info.tablespaces[tblnum],old_cluster.tablespace_suffix);`
	`613`	`+fix_path_separator(os_info.tablespaces[tblnum]),`
	`614`	`+fix_path_separator(old_cluster.tablespace_suffix));`
`582`	`615`	`}`
`583`	`616`
`584`	`617`	`fclose(script);`

`‎contrib/pg_upgrade/pg_upgrade.h`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ extern char *output_files[];`
`72`	`72`	`#definepg_copy_filecopy_file`
`73`	`73`	`#definepg_mv_filerename`
`74`	`74`	`#definepg_link_filelink`
	`75`	`+#definePATH_SEPARATOR '/'`
`75`	`76`	`#defineRM_CMD"rm -f"`
`76`	`77`	`#defineRMDIR_CMD"rm -rf"`
`77`	`78`	`#defineSCRIPT_EXT"sh"`
`@@ -81,6 +82,7 @@ extern char *output_files[];`
`81`	`82`	`#definepg_mv_filepgrename`
`82`	`83`	`#definepg_link_filewin32_pghardlink`
`83`	`84`	`#definesleep(x)Sleep(x * 1000)`
	`85`	`+#definePATH_SEPARATOR '\\'`
`84`	`86`	`#defineRM_CMD"DEL /q"`
`85`	`87`	`#defineRMDIR_CMD"RMDIR /s/q"`
`86`	`88`	`#defineSCRIPT_EXT"bat"`

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!

Commit504aeea

File tree

2 files changed

2 files changed

`‎contrib/pg_upgrade/check.c`

`‎contrib/pg_upgrade/pg_upgrade.h`

0 commit comments