diff options
| author | Bruce Momjian <bruce@momjian.us> | 2015-05-11 12:57:48 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2015-05-11 12:57:48 -0400 |
| commit | 9d15292cfc581d2916778b79df0f0e86e032a677 (patch) | |
| tree | d708d652c3ac0aece44d0553637069710d988f91 /src | |
| parent | 20781765f77c1fb6465aba97d211636ce92e7a0e (diff) | |
| download | postgresql-9d15292cfc581d2916778b79df0f0e86e032a677.tar.gz postgresql-9d15292cfc581d2916778b79df0f0e86e032a677.zip | |
pg_upgrade: use single or double-quotes in command-line strings
This is platform-dependent.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/check.c | 12 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c index 6db223ab070..be66b24cf20 100644 --- a/src/bin/pg_upgrade/check.c +++ b/src/bin/pg_upgrade/check.c @@ -532,7 +532,8 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name) #endif /* delete old cluster's default tablespace */ - fprintf(script, RMDIR_CMD " \"%s\"\n", fix_path_separator(old_cluster.pgdata)); + fprintf(script, RMDIR_CMD " %c%s%c\n", PATH_QUOTE, + fix_path_separator(old_cluster.pgdata), PATH_QUOTE); /* delete old cluster's alternate tablespaces */ for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++) @@ -554,9 +555,10 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name) PATH_SEPARATOR); for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++) - fprintf(script, RMDIR_CMD " \"%s%c%d\"\n", + fprintf(script, RMDIR_CMD " %c%s%c%d%c\n", PATH_QUOTE, fix_path_separator(os_info.old_tablespaces[tblnum]), - PATH_SEPARATOR, old_cluster.dbarr.dbs[dbnum].db_oid); + PATH_SEPARATOR, old_cluster.dbarr.dbs[dbnum].db_oid, + PATH_QUOTE); } else { @@ -566,9 +568,9 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name) * 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 " %c%s%s%c\n", PATH_QUOTE, fix_path_separator(os_info.old_tablespaces[tblnum]), - fix_path_separator(suffix_path)); + fix_path_separator(suffix_path), PATH_QUOTE); pfree(suffix_path); } } diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index 4683c6f71c3..bb035e18813 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -74,6 +74,7 @@ extern char *output_files[]; #define pg_mv_file rename #define pg_link_file link #define PATH_SEPARATOR '/' +#define PATH_QUOTE '\'' #define RM_CMD "rm -f" #define RMDIR_CMD "rm -rf" #define SCRIPT_PREFIX "./" @@ -85,6 +86,7 @@ extern char *output_files[]; #define pg_mv_file pgrename #define pg_link_file win32_pghardlink #define PATH_SEPARATOR '\\' +#define PATH_QUOTE '"' #define RM_CMD "DEL /q" #define RMDIR_CMD "RMDIR /s/q" #define SCRIPT_PREFIX "" |