From 4fb6cbc1fece58549d07554a037ab126bd6aabeb Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Mon, 24 Jul 2023 03:09:43 -0700 Subject: [PATCH] Revert "Polyfill ENOTSOCK in getsockname() and getpeername()" This reverts commit 925219bdf392e938affd32cbea0602d55576d5c2. --- libc/sock/getsockname.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libc/sock/getsockname.c b/libc/sock/getsockname.c index 60915059e..47535ce4e 100644 --- a/libc/sock/getsockname.c +++ b/libc/sock/getsockname.c @@ -39,21 +39,21 @@ static int __getsockpeername(int fd, struct sockaddr *out_addr, uint32_t size = sizeof(ss); if (IsWindows()) { - if (!__isfdopen(fd)) { - rc = ebadf(); - } else if (!__isfdkind(fd, kFdSocket)) { - rc = enotsock(); - } else if ((rc = impl_win32(g_fds.p[fd].handle, &ss, &size))) { - if (impl_win32 == __sys_getsockname_nt && - WSAGetLastError() == WSAEINVAL) { - // The socket has not been bound to an address with bind, or - // ADDR_ANY is specified in bind but connection has not yet - // occurred. -MSDN - ss.ss_family = ((struct SockFd *)g_fds.p[fd].extra)->family; - rc = 0; - } else { - rc = __winsockerr(); + if (__isfdkind(fd, kFdSocket)) { + if ((rc = impl_win32(g_fds.p[fd].handle, &ss, &size))) { + if (impl_win32 == __sys_getsockname_nt && + WSAGetLastError() == WSAEINVAL) { + // The socket has not been bound to an address with bind, or + // ADDR_ANY is specified in bind but connection has not yet + // occurred. -MSDN + ss.ss_family = ((struct SockFd *)g_fds.p[fd].extra)->family; + rc = 0; + } else { + rc = __winsockerr(); + } } + } else { + rc = ebadf(); } } else { rc = impl_sysv(fd, &ss, &size);