NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / gethostname.c

diff --git a/lib/gethostname.c b/lib/gethostname.c
index 6259deb..785fd71 100644 (file)
--- 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-2014 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
@@ -54,7 +54,7 @@ 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;
 }
@@ -64,7 +64,7 @@ gethostname (char *name, size_t len)
    - gethostname() requires linking with -lws2_32.
    - GetComputerName() does not return the right kind of hostname.
    - GetComputerNameEx(ComputerNameDnsHostname,...) returns the right hostname,
-     but it hard to use portably:
+     but it is hard to use portably:
        - It requires defining _WIN32_WINNT to at least 0x0500.
        - With mingw, it also requires
          "#define GetComputerNameEx GetComputerNameExA".
@@ -82,6 +82,8 @@ gethostname (char *name, size_t len)
 /* Get set_winsock_errno. */
 #include "w32sock.h"
 
+#include "sockets.h"
+
 #undef gethostname
 
 int
@@ -91,6 +93,7 @@ rpl_gethostname (char *name, size_t len)
 
   if (len > INT_MAX)
     len = INT_MAX;
+  gl_sockets_startup (SOCKETS_1_1);
   r = gethostname (name, (int) len);
   if (r < 0)
     set_winsock_errno ();