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/bin/pg_rewind/file_ops.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/bin/pg_rewind/file_ops.c')
| -rw-r--r-- | src/bin/pg_rewind/file_ops.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c index 6cb288f0992..7d98283c79c 100644 --- a/src/bin/pg_rewind/file_ops.c +++ b/src/bin/pg_rewind/file_ops.c @@ -431,11 +431,7 @@ recurse_dir(const char *datadir, const char *parentpath, /* recurse to handle subdirectories */ recurse_dir(datadir, path, callback); } -#ifndef WIN32 else if (S_ISLNK(fst.st_mode)) -#else - else if (pgwin32_is_junction(fullpath)) -#endif { #if defined(HAVE_READLINK) || defined(WIN32) char link_target[MAXPGPATH]; |