From: Thomas Munro Date: Tue, 25 Oct 2022 02:10:49 +0000 (+1300) Subject: Fix symlink() errno on Windows. X-Git-Tag: REL_16_BETA1~1428 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=359d601095ce2361bad50f9f8b0bcfe4da1eb886;p=thirdparty%2Fpostgresql.git Fix symlink() errno on Windows. Ancient bug noticed while working on a test suite for these functions. https://postgr.es/m/CA%2BhUKG%2BajSQ_8eu2AogTncOnZ5me2D-Cn66iN_-wZnRjLN%2Bicg%40mail.gmail.com --- diff --git a/src/port/dirmod.c b/src/port/dirmod.c index ae6301dd6cc..51c9bded8fb 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; }