Commit08aaae4

committed

pg_upgrade: quote directory names in delete_old_cluster script

This allows the delete script to properly function when specialcharacters appear in directory paths, e.g. spaces.Backpatch through 9.0

1 parent55179b0 commit08aaae4Copy full SHA for 08aaae4

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ create_script_for_old_cluster_deletion(`
`483`	`483`	`#endif`
`484`	`484`
`485`	`485`	`/* delete old cluster's default tablespace */`
`486`		`-fprintf(script,RMDIR_CMD"%s\n",fix_path_separator(old_cluster.pgdata));`
	`486`	`+fprintf(script,RMDIR_CMD"\"%s\"\n",fix_path_separator(old_cluster.pgdata));`
`487`	`487`
`488`	`488`	`/* delete old cluster's alternate tablespaces */`
`489`	`489`	`for (tblnum=0;tblnum<os_info.num_tablespaces;tblnum++)`
`@@ -507,7 +507,7 @@ create_script_for_old_cluster_deletion(`
`507`	`507`
`508`	`508`	`for (dbnum=0;dbnum<new_cluster.dbarr.ndbs;dbnum++)`
`509`	`509`	`{`
`510`		`-fprintf(script,RMDIR_CMD" %s%s%c%d\n",`
	`510`	`+fprintf(script,RMDIR_CMD"\"%s%s%c%d\"\n",`
`511`	`511`	`fix_path_separator(os_info.tablespaces[tblnum]),`
`512`	`512`	`fix_path_separator(old_cluster.tablespace_suffix),`
`513`	`513`	`PATH_SEPARATOR,old_cluster.dbarr.dbs[dbnum].db_oid);`
`@@ -519,7 +519,7 @@ create_script_for_old_cluster_deletion(`
`519`	`519`	`* Simply delete the tablespace directory, which might be ".old"`
`520`	`520`	`* or a version-specific subdirectory.`
`521`	`521`	`*/`
`522`		`-fprintf(script,RMDIR_CMD" %s%s\n",`
	`522`	`+fprintf(script,RMDIR_CMD"\"%s%s\"\n",`
`523`	`523`	`fix_path_separator(os_info.tablespaces[tblnum]),`
`524`	`524`	`fix_path_separator(old_cluster.tablespace_suffix));`
`525`	`525`	`}`

Comments

(0)