Port test-getaddrinfo to Solaris (fixed version; previous change was wrong).

[gnulib.git] / tests / test-getaddrinfo.c

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index 9f42fff..7763f43 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -1,11 +1,11 @@
 /* Test the getaddrinfo module.
 
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -13,8 +13,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Simon Josefsson.  */
 
@@ -24,6 +23,15 @@
 #include <stdio.h>
 #include <string.h>
 
+/* BeOS does not have AF_UNSPEC.  */
+#ifndef AF_UNSPEC
+# define AF_UNSPEC 0
+#endif
+
+#ifndef EAI_SERVICE
+# define EAI_SERVICE 0
+#endif
+
 int simple (char *host, char *service)
 {
   char buf[BUFSIZ];
@@ -33,16 +41,26 @@ int simple (char *host, char *service)
 
   printf ("Finding %s service %s...\n", host, service);
 
+  /* This initializes "hints" but does not use it.  Is there a reason
+     for this?  If so, please fix this comment.  */
   memset (&hints, 0, sizeof (hints));
   hints.ai_flags = AI_CANONNAME;
   hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
+
   res = getaddrinfo (host, service, 0, &ai0);
 
   printf ("res %d: %s\n", res, gai_strerror (res));
 
   if (res != 0)
-    return 1;
+    {
+      /* Solaris reports EAI_SERVICE for "http" and "https".  Don't
+         fail the test merely because of this.  */
+      if (res == EAI_SERVICE)
+       return 0;
+
+      return 1;
+    }
 
   for (ai = ai0; ai; ai = ai->ai_next)
     {
@@ -50,7 +68,7 @@ int simple (char *host, char *service)
       printf ("\tfamily %x\n", ai->ai_family);
       printf ("\tsocktype %x\n", ai->ai_socktype);
       printf ("\tprotocol %x\n", ai->ai_protocol);
-      printf ("\taddrlen %d: ", ai->ai_addrlen);
+      printf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
       printf ("\tFound %s\n",
              inet_ntop (ai->ai_family,
                         &((struct sockaddr_in *)