From: corinna <corinna>
Date: Fri, 10 Jan 2003 12:55:46 +0000 (+0000)
Subject: 	* autoload.cc (gethostname): Make call optional, return 1 if function
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25d457684e2181d1ab1d57cd576743d8317f0bb6;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* autoload.cc (gethostname): Make call optional, return 1 if function
	can't get loaded.
	* net.cc (cygwin_gethostname): Call GetComputerName if return value
	of gethostname is non-zero.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9172cc0b31..01338e106d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10  Corinna Vinschen <corinna@vinschen.de>
+
+	* autoload.cc (gethostname): Make call optional, return 1 if function
+	can't get loaded.
+	* net.cc (cygwin_gethostname): Call GetComputerName if return value
+	of gethostname is non-zero.
+
 2003-01-10  Charles Wilson  <cwilson@ece.gatech.edu>
 
 	* cygwin.din: add asprintf and vasprintf, as well as the reentrant
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index 5210623a0b..2d75604cb7 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -445,7 +445,7 @@ LoadDLLfunc (closesocket, 4, wsock32)
 LoadDLLfunc (connect, 12, wsock32)
 LoadDLLfunc (gethostbyaddr, 12, wsock32)
 LoadDLLfunc (gethostbyname, 4, wsock32)
-LoadDLLfunc (gethostname, 8, wsock32)
+LoadDLLfuncEx2 (gethostname, 8, wsock32, 1, 1)
 LoadDLLfunc (getpeername, 12, wsock32)
 LoadDLLfunc (getprotobyname, 4, wsock32)
 LoadDLLfunc (getprotobynumber, 4, wsock32)
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index b558ad78b8..b55e439b4d 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -896,7 +896,7 @@ cygwin_gethostname (char *name, size_t len)
   if (__check_null_invalid_struct_errno (name, len))
     return -1;
 
-  if (gethostname (name, len) == SOCKET_ERROR)
+  if (gethostname (name, len))
     {
       DWORD local_len = len;