From 4ae178f6073b891bb98dd6681bd209fcb8d6c3e7 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 11 Feb 2015 22:06:04 -0500 Subject: [PATCH] pg_upgrade: quote directory names in delete_old_cluster script This allows the delete script to properly function when special characters appear in directory paths, e.g. spaces. Backpatch through 9.0 --- contrib/pg_upgrade/check.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 7a84dc4f5e..05c46a5ec7 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -432,7 +432,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx, #endif /* delete old cluster's default tablespace */ - fprintf(script, RMDIR_CMD " %s\n", fix_path_separator(ctx, ctx->old.pgdata)); + fprintf(script, RMDIR_CMD " \"%s\"\n", fix_path_separator(ctx, ctx->old.pgdata)); /* delete old cluster's alternate tablespaces */ for (tblnum = 0; tblnum < ctx->num_tablespaces; tblnum++) @@ -456,7 +456,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx, for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++) { - fprintf(script, RMDIR_CMD " %s%s%c%d\n", + fprintf(script, RMDIR_CMD " \"%s%s%c%d\"\n", fix_path_separator(ctx, ctx->tablespaces[tblnum]), fix_path_separator(ctx, ctx->old.tablespace_suffix), PATH_SEPARATOR, ctx->old.dbarr.dbs[dbnum].db_oid); @@ -468,7 +468,7 @@ create_script_for_old_cluster_deletion(migratorContext *ctx, * Simply delete the tablespace directory, which might be ".old" * or a version-specific subdirectory. */ - fprintf(script, RMDIR_CMD " %s%s\n", + fprintf(script, RMDIR_CMD " \"%s%s\"\n", fix_path_separator(ctx, ctx->tablespaces[tblnum]), fix_path_separator(ctx, ctx->old.tablespace_suffix)); } -- 2.40.0