mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_upgrade: use single or double-quotes in command-line strings

Browse Source 
This is platform-dependent.
This commit is contained in:
Bruce Momjian 2015-05-11 12:57:48 -04:00
parent 20781765f7
commit 9d15292cfc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/pg_upgrade/check.c
View File

@ -532,7 +532,8 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
#endif #endif
/* delete old cluster's default tablespace */ /* 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 */ /* delete old cluster's alternate tablespaces */
for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++) 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); PATH_SEPARATOR);
for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++) 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]), 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 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" * Simply delete the tablespace directory, which might be ".old"
* or a version-specific subdirectory. * 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(os_info.old_tablespaces[tblnum]),
fix_path_separator(suffix_path)); fix_path_separator(suffix_path), PATH_QUOTE);
pfree(suffix_path); pfree(suffix_path);
} }
} }

2
src/bin/pg_upgrade/pg_upgrade.h
View File

@ -74,6 +74,7 @@ extern char *output_files[];
#define pg_mv_file rename #define pg_mv_file rename
#define pg_link_file link #define pg_link_file link
#define PATH_SEPARATOR '/' #define PATH_SEPARATOR '/'
#define PATH_QUOTE '\''
#define RM_CMD "rm -f" #define RM_CMD "rm -f"
#define RMDIR_CMD "rm -rf" #define RMDIR_CMD "rm -rf"
#define SCRIPT_PREFIX "./" #define SCRIPT_PREFIX "./"
@ -85,6 +86,7 @@ extern char *output_files[];
#define pg_mv_file pgrename #define pg_mv_file pgrename
#define pg_link_file win32_pghardlink #define pg_link_file win32_pghardlink
#define PATH_SEPARATOR '\\' #define PATH_SEPARATOR '\\'
#define PATH_QUOTE '"'
#define RM_CMD "DEL /q" #define RM_CMD "DEL /q"
#define RMDIR_CMD "RMDIR /s/q" #define RMDIR_CMD "RMDIR /s/q"
#define SCRIPT_PREFIX "" #define SCRIPT_PREFIX ""