X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgethostname.c;h=9de54bce7cc40d63d475e7bc0c2fb1d289b62fa1;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=782c4028f07f051142052ed44bf58687543374cb;hpb=33bcc047c11586cff59d22566226e847e0c23954;p=gnulib.git

diff --git a/lib/gethostname.c b/lib/gethostname.c
index 782c4028f..9de54bce7 100644
--- a/lib/gethostname.c
+++ b/lib/gethostname.c
@@ -1,6 +1,6 @@
 /* gethostname emulation for SysV and POSIX.1.
 
-   Copyright (C) 1992, 2003, 2006, 2008, 2009 Free Software Foundation, Inc.
+   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
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+/* Unix API.  */
 
 /* Specification.  */
 #include <unistd.h>
@@ -53,26 +54,47 @@ 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 <unistd.h>
 
+/* Get INT_MAX.  */
+#include <limits.h>
+
 /* Get set_winsock_errno. */
 #include "w32sock.h"
 
+#include "sockets.h"
+
 #undef gethostname
 
 int
-rpl_gethostname (char *name, size_t namelen)
+rpl_gethostname (char *name, size_t len)
 {
-  int r = gethostname (name, (int) namelen);
+  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 ();