diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2022-08-06 12:02:43 +1200 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2024-11-08 09:29:40 +1030 |
| commit | f95ad555de5623588bcc6e48fe8a3fd50d721216 (patch) | |
| tree | 30155fd493e266f4b7ffb0824fdcb607758debe3 /src/backend/backup/basebackup.c | |
| parent | f2a4a137bb93922a925255665f5a47094ed8c9df (diff) | |
Replace pgwin32_is_junction() with lstat().
Now that lstat() reports junction points with S_IFLNK/S_ISLINK(), and
unlink() can unlink them, there is no need for conditional code for
Windows in a few places. That was expressed by testing for WIN32 or
S_ISLNK, which we can now constant-fold.
The coding around pgwin32_is_junction() was a bit suspect anyway, as we
never checked for errors, and we also know that errors can be spuriously
reported because of transient sharing violations on this OS. The
lstat()-based code has handling for that.
This also reverts 4fc6b6ee on master only. That was done because
lstat() didn't previously work for symlinks (junction points), but now
it does.
Tested-by: Andrew Dunstan <andrew@dunslane.net>
Discussion: https://postgr.es/m/CA%2BhUKGLfOOeyZpm5ByVcAt7x5Pn-%3DxGRNCvgiUPVVzjFLtnY0w%40mail.gmail.com
(cherry picked from commit 5fc88c5d53e43fa7dcea93499d230a0bf70f4f77)
Author: Thomas Munro <tmunro@postgresql.org>
Author: Alexandra Wang <alexandra.wang.oss@gmail.com>
Diffstat (limited to 'src/backend/backup/basebackup.c')
| -rw-r--r-- | src/backend/backup/basebackup.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index 847a52f599b..3fe6468400e 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -1325,13 +1325,7 @@ sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly, } /* Allow symbolic links in pg_tblspc only */ - if (strcmp(path, "./pg_tblspc") == 0 && -#ifndef WIN32 - S_ISLNK(statbuf.st_mode) -#else - pgwin32_is_junction(pathbuf) -#endif - ) + if (strcmp(path, "./pg_tblspc") == 0 && S_ISLNK(statbuf.st_mode)) { #if defined(HAVE_READLINK) || defined(WIN32) char linkpath[MAXPGPATH]; @@ -1815,11 +1809,7 @@ static void convert_link_to_directory(const char *pathbuf, struct stat *statbuf) { /* If symlink, write it as a directory anyway */ -#ifndef WIN32 if (S_ISLNK(statbuf->st_mode)) -#else - if (pgwin32_is_junction(pathbuf)) -#endif statbuf->st_mode = S_IFDIR | pg_dir_create_mode; } |