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:36:53 +1030 |
| commit | ca9921936ea352df30db2955fb2662695d8377be (patch) | |
| tree | fe417a7cf8df1471a73fd188258d67833c5cf431 /src/backend/commands/tablespace.c | |
| parent | 8a5e4982f9c536fafa4ae9b7c331ee656ded2fe5 (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/commands/tablespace.c')
| -rw-r--r-- | src/backend/commands/tablespace.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index edd1ac03306..9d895960aaf 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -787,8 +787,7 @@ destroy_tablespace_directories(Oid tablespaceoid, bool redo) /* * Try to remove the symlink. We must however deal with the possibility * that it's a directory instead of a symlink --- this could happen during - * WAL replay (see TablespaceCreateDbspace), and it is also the case on - * Windows where junction points lstat() as directories. + * WAL replay (see TablespaceCreateDbspace). * * Note: in the redo case, we'll return true if this final step fails; * there's no point in retrying it. Also, ENOENT should provoke no more @@ -818,7 +817,6 @@ remove_symlink: linkloc))); } } -#ifdef S_ISLNK else if (S_ISLNK(st.st_mode)) { if (unlink(linkloc) < 0) @@ -831,7 +829,6 @@ remove_symlink: linkloc))); } } -#endif else { /* Refuse to remove anything that's not a directory or symlink */ @@ -909,7 +906,6 @@ remove_tablespace_symlink(const char *linkloc) errmsg("could not remove directory \"%s\": %m", linkloc))); } -#ifdef S_ISLNK else if (S_ISLNK(st.st_mode)) { if (unlink(linkloc) < 0 && errno != ENOENT) @@ -918,7 +914,6 @@ remove_tablespace_symlink(const char *linkloc) errmsg("could not remove symbolic link \"%s\": %m", linkloc))); } -#endif else { /* Refuse to remove anything that's not a directory or symlink */ |