* canon-host.c (canon_host_r): Work around bug in Darwin 7.9.0

getaddrinfo.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4393e2bbe2382238c44731e8296453363374f15a..2844e7c370b03ea11f4729ec3e1dd0a2b78c9259 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-27  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * canon-host.c (canon_host_r): Work around bug in Darwin 7.9.0
+       getaddrinfo.
+
        * __fpending.h: Don't include <stdio_ext.h> unless
        HAVE_DECL___FPENDING.  This avoids a bug with lsbcc, where
        it causes <stdio_ext.h> to cause a compile-time error.

diff --git a/lib/canon-host.c b/lib/canon-host.c
index c0b7c13445874f92207c3acae929dbbf1c125931..c29f314314f4a457c64e5a997f22eee565b90d3e 100644 (file)
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -69,7 +69,10 @@ canon_host_r (char const *host, int *cherror)
   status = getaddrinfo (host, NULL, &hints, &res);
   if (!status)
     {
-      retval = strdup (res->ai_canonname);
+      /* http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00300.html
+        says Darwin 7.9.0 getaddrinfo returns 0 but sets
+        res->ai_canonname to NULL.  */
+      retval = strdup (res->ai_canonname ? res->ai_canonname : host);
       if (!retval && cherror)
        *cherror = EAI_MEMORY;
       freeaddrinfo (res);