X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgethostname.c;h=22015732298a75f429fdd14a0d743bb198583954;hb=0658e5039f75053480a7599edca236fecffe100d;hp=de3d9a527f4be18ce2ac07f0f863c74b9c3d13f4;hpb=e9ad8e6293db75ca77d4910ff97a0222da259c0a;p=gnulib.git
diff --git a/lib/gethostname.c b/lib/gethostname.c
index de3d9a527..220157322 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 Free Software Foundation, Inc.
+ Copyright (C) 1992, 2003, 2006, 2008-2013 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,16 +15,23 @@
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
+
#ifdef HAVE_UNAME
# include
-#else
-# 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. */
@@ -47,7 +54,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