Commit66f5217

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 parentd99cf27 commit66f5217Copy full SHA for 66f5217

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`656`	`656`	`#endif`
`657`	`657`
`658`	`658`	`/* delete old cluster's default tablespace */`
`659`		`-fprintf(script,RMDIR_CMD"%s\n",fix_path_separator(old_cluster.pgdata));`
	`659`	`+fprintf(script,RMDIR_CMD"\"%s\"\n",fix_path_separator(old_cluster.pgdata));`
`660`	`660`
`661`	`661`	`/* delete old cluster's alternate tablespaces */`
`662`	`662`	`for (tblnum=0;tblnum<os_info.num_tablespaces;tblnum++)`
`@@ -680,7 +680,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`680`	`680`
`681`	`681`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`
`682`	`682`	`{`
`683`		`-fprintf(script,RMDIR_CMD" %s%s%c%d\n",`
	`683`	`+fprintf(script,RMDIR_CMD"\"%s%s%c%d\"\n",`
`684`	`684`	`fix_path_separator(os_info.tablespaces[tblnum]),`
`685`	`685`	`fix_path_separator(old_cluster.tablespace_suffix),`
`686`	`686`	`PATH_SEPARATOR,old_cluster.dbarr.dbs[dbnum].db_oid);`
`@@ -692,7 +692,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`692`	`692`	`* Simply delete the tablespace directory, which might be ".old"`
`693`	`693`	`* or a version-specific subdirectory.`
`694`	`694`	`*/`
`695`		`-fprintf(script,RMDIR_CMD" %s%s\n",`
	`695`	`+fprintf(script,RMDIR_CMD"\"%s%s\"\n",`
`696`	`696`	`fix_path_separator(os_info.tablespaces[tblnum]),`
`697`	`697`	`fix_path_separator(old_cluster.tablespace_suffix));`
`698`	`698`	`}`

Comments

(0)