Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
9d15292c
Commit
9d15292c
authored
May 11, 2015
by
Bruce Momjian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pg_upgrade: use single or double-quotes in command-line strings
This is platform-dependent.
parent
20781765
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
src/bin/pg_upgrade/check.c
src/bin/pg_upgrade/check.c
+7
-5
src/bin/pg_upgrade/pg_upgrade.h
src/bin/pg_upgrade/pg_upgrade.h
+2
-0
No files found.
src/bin/pg_upgrade/check.c
View file @
9d15292c
...
...
@@ -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
);
}
}
...
...
src/bin/pg_upgrade/pg_upgrade.h
View file @
9d15292c
...
...
@@ -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 ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment