Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit067a225

Browse files
committed
pg_basebackup: Fix comparison handling of tablespace mappings on Windows
A candidate path needs to be canonicalized before being checked againstthe mappings, because the mappings are also canonicalized. This isespecially relevant on WindowsReported-by: nb <nbedxp@gmail.com>Author: Michael Paquier <michael.paquier@gmail.com>Reviewed-by: Ashutosh Sharma <ashu.coek88@gmail.com>
1 parent63d6b97 commit067a225

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,11 @@ tablespace_list_append(const char *arg)
298298
exit(1);
299299
}
300300

301+
/*
302+
* Comparisons done with these values should involve similarly
303+
* canonicalized path values. This is particularly sensitive on Windows
304+
* where path values may not necessarily use Unix slashes.
305+
*/
301306
canonicalize_path(cell->old_dir);
302307
canonicalize_path(cell->new_dir);
303308

@@ -1303,9 +1308,14 @@ static const char *
13031308
get_tablespace_mapping(constchar*dir)
13041309
{
13051310
TablespaceListCell*cell;
1311+
charcanon_dir[MAXPGPATH];
1312+
1313+
/* Canonicalize path for comparison consistency */
1314+
strlcpy(canon_dir,dir,sizeof(canon_dir));
1315+
canonicalize_path(canon_dir);
13061316

13071317
for (cell=tablespace_dirs.head;cell;cell=cell->next)
1308-
if (strcmp(dir,cell->old_dir)==0)
1318+
if (strcmp(canon_dir,cell->old_dir)==0)
13091319
returncell->new_dir;
13101320

13111321
returndir;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp