From 309577d0c40a12dfe2c3a19cca322f69a81bce45 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Wed, 12 Oct 2022 16:34:09 +1300 Subject: [PATCH 03/10] Fix symlink() errno in Windows replacement code. Ancient bug noticed while adding tests for these functions. --- src/port/dirmod.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/port/dirmod.c b/src/port/dirmod.c index ae6301dd6c..51c9bded8f 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -197,7 +197,10 @@ pgsymlink(const char *oldpath, const char *newpath) FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0); if (dirhandle == INVALID_HANDLE_VALUE) + { + _dosmaperr(GetLastError()); return -1; + } /* make sure we have an unparsed native win32 path */ if (memcmp("\\??\\", oldpath, 4) != 0) @@ -230,8 +233,11 @@ pgsymlink(const char *oldpath, const char *newpath) 0, 0, &len, 0)) { LPSTR msg; + int save_errno; + + _dosmaperr(GetLastError()); + save_errno = errno; - errno = 0; FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, @@ -251,6 +257,9 @@ pgsymlink(const char *oldpath, const char *newpath) CloseHandle(dirhandle); RemoveDirectory(newpath); + + errno = save_errno; + return -1; } -- 2.37.3