X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgethostname.c;h=9de54bce7cc40d63d475e7bc0c2fb1d289b62fa1;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=3d66dc936052dd3229845f9732b6fed94c401add;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git
diff --git a/lib/gethostname.c b/lib/gethostname.c
index 3d66dc936..9de54bce7 100644
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -1,10 +1,11 @@
/* gethostname emulation for SysV and POSIX.1.
- Copyright (C) 1992 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1992, 2003, 2006, 2008-2011 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,27 +13,33 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-/* David MacKenzie */
+/* David MacKenzie
+ Windows port by Simon Josefsson */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+/* Unix API. */
+
+/* Specification. */
+#include
#ifdef HAVE_UNAME
# include
#endif
+#include
+
/* Put up to LEN chars of the host name into NAME.
Null terminate it if the name is shorter than LEN.
Return 0 if ok, -1 if error. */
+#include
+
int
-gethostname (name, len)
- char *name;
- int len;
+gethostname (char *name, size_t len)
{
#ifdef HAVE_UNAME
struct utsname uts;
@@ -47,7 +54,51 @@ gethostname (name, 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