Commit5eef3c6

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 parentc7bc5be commit5eef3c6Copy full SHA for 5eef3c6

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`641`	`641`	`#endif`
`642`	`642`
`643`	`643`	`/* delete old cluster's default tablespace */`
`644`		`-fprintf(script,RMDIR_CMD"%s\n",fix_path_separator(old_cluster.pgdata));`
	`644`	`+fprintf(script,RMDIR_CMD"\"%s\"\n",fix_path_separator(old_cluster.pgdata));`
`645`	`645`
`646`	`646`	`/* delete old cluster's alternate tablespaces */`
`647`	`647`	`for (tblnum=0;tblnum<os_info.num_old_tablespaces;tblnum++)`
`@@ -663,7 +663,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`663`	`663`	`PATH_SEPARATOR);`
`664`	`664`
`665`	`665`	`for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)`
`666`		`-fprintf(script,RMDIR_CMD" %s%c%d\n",`
	`666`	`+fprintf(script,RMDIR_CMD"\"%s%c%d\"\n",`
`667`	`667`	`fix_path_separator(os_info.old_tablespaces[tblnum]),`
`668`	`668`	`PATH_SEPARATOR,old_cluster.dbarr.dbs[dbnum].db_oid);`
`669`	`669`	`}`
`@@ -675,7 +675,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`675`	`675`	`* Simply delete the tablespace directory, which might be ".old"`
`676`	`676`	`* or a version-specific subdirectory.`
`677`	`677`	`*/`
`678`		`-fprintf(script,RMDIR_CMD" %s%s\n",`
	`678`	`+fprintf(script,RMDIR_CMD"\"%s%s\"\n",`
`679`	`679`	`fix_path_separator(os_info.old_tablespaces[tblnum]),`
`680`	`680`	`fix_path_separator(suffix_path));`
`681`	`681`	`pfree(suffix_path);`

Comments

(0)