From 74da141e618ef99959d509cb2e7be35a348a39db Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Wed, 7 Apr 2010 21:11:46 -0400 Subject: Sync with the latest Gnulib code (177f525) Signed-off-by: Thomas Guyot-Sionnest --- gl/gethostname.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) (limited to 'gl/gethostname.c') diff --git a/gl/gethostname.c b/gl/gethostname.c index acff351d..b0da748f 100644 --- a/gl/gethostname.c +++ b/gl/gethostname.c @@ -1,6 +1,7 @@ /* gethostname emulation for SysV and POSIX.1. - Copyright (C) 1992, 2003, 2006, 2008 Free Software Foundation, Inc. + Copyright (C) 1992, 2003, 2006, 2008, 2009, 2010 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,10 +16,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* David MacKenzie */ +/* David MacKenzie + Windows port by Simon Josefsson */ #include +#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) +/* Unix API. */ + /* Specification. */ #include @@ -50,7 +55,51 @@ gethostname (char *name, size_t len) } strncpy (name, uts.nodename, len); #else - strcpy (name, ""); /* Hardcode your system name if you want. */ + strcpy (name, ""); /* Hardcode your system name if you want. */ #endif return 0; } + +#else +/* Native Windows API. Which primitive to choose? + - gethostname() requires linking with -lws2_32. + - GetComputerName() does not return the right kind of hostname. + - GetComputerNameEx(ComputerNameDnsHostname,...) returns the right hostname, + but it is hard to use portably: + - It requires defining _WIN32_WINNT to at least 0x0500. + - With mingw, it also requires + "#define GetComputerNameEx GetComputerNameExA". + - With older versions of mingw, none of the declarations are present at + all, not even of the enum value ComputerNameDnsHostname. + So we use gethostname(). Linking with -lws2_32 is the least evil. */ + +#define WIN32_LEAN_AND_MEAN +/* Get winsock2.h. */ +#include + +/* Get INT_MAX. */ +#include + +/* Get set_winsock_errno. */ +#include "w32sock.h" + +#include "sockets.h" + +#undef gethostname + +int +rpl_gethostname (char *name, size_t len) +{ + int r; + + if (len > INT_MAX) + len = INT_MAX; + gl_sockets_startup (SOCKETS_1_1); + r = gethostname (name, (int) len); + if (r < 0) + set_winsock_errno (); + + return r; +} + +#endif -- cgit v1.2.3