summaryrefslogtreecommitdiffstats
path: root/gl/sockets.c
diff options
context:
space:
mode:
authorLorenz <12514511+RincewindsHat@users.noreply.github.com>2023-02-10 10:43:20 (GMT)
committerGitHub <noreply@github.com>2023-02-10 10:43:20 (GMT)
commitc07206f2ccc2356aa74bc6813a94c2190017d44e (patch)
tree1677e5fdca5c3ce544e92c5484e16a0b68df1cc9 /gl/sockets.c
parente92046f810658016b7c373677efefda3b21400e4 (diff)
parentd2fcf49ad4afc15f37d082d7bc96a808369ec2d4 (diff)
downloadmonitoring-plugins-c07206f2ccc2356aa74bc6813a94c2190017d44e.tar.gz
Merge pull request #1832 from RincewindsHat/gnulib_update_2023
Gnulib update 2023 and attendant fixes
Diffstat (limited to 'gl/sockets.c')
-rw-r--r--gl/sockets.c33
1 files changed, 20 insertions, 13 deletions
diff --git a/gl/sockets.c b/gl/sockets.c
index ae96148..ca99db8 100644
--- a/gl/sockets.c
+++ b/gl/sockets.c
@@ -1,19 +1,19 @@
1/* sockets.c --- wrappers for Windows socket functions 1/* sockets.c --- wrappers for Windows socket functions
2 2
3 Copyright (C) 2008-2013 Free Software Foundation, Inc. 3 Copyright (C) 2008-2023 Free Software Foundation, Inc.
4 4
5 This program is free software: you can redistribute it and/or modify 5 This file is free software: you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU Lesser General Public License as
7 the Free Software Foundation; either version 3 of the License, or 7 published by the Free Software Foundation; either version 2.1 of the
8 (at your option) any later version. 8 License, or (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This file is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU Lesser General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU Lesser General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 16 along with this program. If not, see <https://www.gnu.org/licenses/>. */
17 17
18/* Written by Simon Josefsson */ 18/* Written by Simon Josefsson */
19 19
@@ -28,7 +28,11 @@
28# include <sys/socket.h> 28# include <sys/socket.h>
29 29
30# include "fd-hook.h" 30# include "fd-hook.h"
31# include "msvc-nothrow.h" 31# if GNULIB_MSVC_NOTHROW
32# include "msvc-nothrow.h"
33# else
34# include <io.h>
35# endif
32 36
33/* Get set_winsock_errno, FD_TO_SOCKET etc. */ 37/* Get set_winsock_errno, FD_TO_SOCKET etc. */
34# include "w32sock.h" 38# include "w32sock.h"
@@ -109,7 +113,7 @@ static int initialized_sockets_version /* = 0 */;
109#endif /* WINDOWS_SOCKETS */ 113#endif /* WINDOWS_SOCKETS */
110 114
111int 115int
112gl_sockets_startup (int version _GL_UNUSED) 116gl_sockets_startup (_GL_UNUSED int version)
113{ 117{
114#if WINDOWS_SOCKETS 118#if WINDOWS_SOCKETS
115 if (version > initialized_sockets_version) 119 if (version > initialized_sockets_version)
@@ -121,8 +125,11 @@ gl_sockets_startup (int version _GL_UNUSED)
121 if (err != 0) 125 if (err != 0)
122 return 1; 126 return 1;
123 127
124 if (data.wVersion < version) 128 if (data.wVersion != version)
125 return 2; 129 {
130 WSACleanup ();
131 return 2;
132 }
126 133
127 if (initialized_sockets_version == 0) 134 if (initialized_sockets_version == 0)
128 register_fd_hook (close_fd_maybe_socket, ioctl_fd_maybe_socket, 135 register_fd_hook (close_fd_maybe_socket, ioctl_fd_maybe_socket,