diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2003-01-10 12:55:47 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2003-01-10 12:55:47 +0000 |
| commit | dc8d11f52e5eda900c9b7dc06aab19567b1c9a50 (patch) | |
| tree | 4408211913e6e708555e2ec2c9610ee893609ce7 | |
| parent | e136dbc2975f6821be7eeba06bf9ae6fdb9f5c4e (diff) | |
| download | cygnal-dc8d11f52e5eda900c9b7dc06aab19567b1c9a50.tar.gz cygnal-dc8d11f52e5eda900c9b7dc06aab19567b1c9a50.tar.bz2 cygnal-dc8d11f52e5eda900c9b7dc06aab19567b1c9a50.zip | |
* 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.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/autoload.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/net.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9172cc0b3..01338e106 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 5210623a0..2d75604cb 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 b558ad78b..b55e439b4 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; |