summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2009-11-23 22:55:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-24 08:57:39 (GMT)
commitb7cc9f82594a2d5fe12867c515d86d91ecedad8f (patch)
treeeecc9024254902cb3c6030d5d8a382afc9b8cfc4 /compat
parent1fdffa616119aeb607e211a77688c9bc3883ca87 (diff)
downloadgit-b7cc9f82594a2d5fe12867c515d86d91ecedad8f.zip
git-b7cc9f82594a2d5fe12867c515d86d91ecedad8f.tar.gz
git-b7cc9f82594a2d5fe12867c515d86d91ecedad8f.tar.bz2
Refactor winsock initialization into a separate function
The winsock library must be initialized. Since gethostbyname() is the first function that calls into winsock, it was overridden to do the initialization. This refactoring helps the next patch, where other functions can be called earlier. Signed-off-by: Martin Storsjo <martin@martin.st> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 15fe33e..f9d82ff 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -903,16 +903,25 @@ char **make_augmented_environ(const char *const *vars)
return env;
}
-/* this is the first function to call into WS_32; initialize it */
-#undef gethostbyname
-struct hostent *mingw_gethostbyname(const char *host)
+static void ensure_socket_initialization(void)
{
WSADATA wsa;
+ static int initialized = 0;
+
+ if (initialized)
+ return;
if (WSAStartup(MAKEWORD(2,2), &wsa))
die("unable to initialize winsock subsystem, error %d",
WSAGetLastError());
atexit((void(*)(void)) WSACleanup);
+ initialized = 1;
+}
+
+#undef gethostbyname
+struct hostent *mingw_gethostbyname(const char *host)
+{
+ ensure_socket_initialization();
return gethostbyname(host);
}