Commit9ecd51d

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 parente20523f commit9ecd51dCopy full SHA for 9ecd51d

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`681`	`681`	`#endif`
`682`	`682`
`683`	`683`	`/* delete old cluster's default tablespace */`
`684`		`-fprintf(script,RMDIR_CMD"%s\n",fix_path_separator(old_cluster.pgdata));`
	`684`	`+fprintf(script,RMDIR_CMD"\"%s\"\n",fix_path_separator(old_cluster.pgdata));`
`685`	`685`
`686`	`686`	`/* delete old cluster's alternate tablespaces */`
`687`	`687`	`for (tblnum=0;tblnum<os_info.num_old_tablespaces;tblnum++)`
`@@ -705,7 +705,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`705`	`705`
`706`	`706`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`
`707`	`707`	`{`
`708`		`-fprintf(script,RMDIR_CMD" %s%s%c%d\n",`
	`708`	`+fprintf(script,RMDIR_CMD"\"%s%s%c%d\"\n",`
`709`	`709`	`fix_path_separator(os_info.old_tablespaces[tblnum]),`
`710`	`710`	`fix_path_separator(old_cluster.tablespace_suffix),`
`711`	`711`	`PATH_SEPARATOR,old_cluster.dbarr.dbs[dbnum].db_oid);`
`@@ -717,7 +717,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`717`	`717`	`* Simply delete the tablespace directory, which might be ".old"`
`718`	`718`	`* or a version-specific subdirectory.`
`719`	`719`	`*/`
`720`		`-fprintf(script,RMDIR_CMD" %s%s\n",`
	`720`	`+fprintf(script,RMDIR_CMD"\"%s%s\"\n",`
`721`	`721`	`fix_path_separator(os_info.old_tablespaces[tblnum]),`
`722`	`722`	`fix_path_separator(old_cluster.tablespace_suffix));`
`723`	`723`	`}`

Comments

(0)