test-getaddrinfo: whitespace cleanup

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

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index 4148788..eeea3f7 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -1,6 +1,6 @@
 /* Test the getaddrinfo module.
 
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009 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
@@ -17,51 +17,104 @@
 
 /* Written by Simon Josefsson.  */
 
-#include "config.h"
-#include "getaddrinfo.h"
-#include "inet_ntop.h"
+#include <config.h>
+#include <netdb.h>
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
 
+/* Whether to print debugging messages.  */
+#define ENABLE_DEBUGGING 0
+
+#if ENABLE_DEBUGGING
+# define dbgprintf printf
+#else
+# define dbgprintf if (0) printf
+#endif
+
 /* 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];
+  static int skip = 0;
   struct addrinfo hints;
   struct addrinfo *ai0, *ai;
   int res;
+  int err;
 
-  printf ("Finding %s service %s...\n", host, service);
+  /* Once we skipped the test, do not try anything else */
+  if (skip)
+    return 0;
 
+  dbgprintf ("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);
+  err = errno;
 
-  printf ("res %d: %s\n", res, gai_strerror (res));
+  dbgprintf ("res %d: %s\n", res, gai_strerror (res));
 
   if (res != 0)
-    return 1;
+    {
+      /* EAI_AGAIN is returned if no network is available. Don't fail
+        the test merely because someone is down the country on their
+        in-law's farm. */
+      if (res == EAI_AGAIN)
+       {
+         skip++;
+         fprintf (stderr, "skipping getaddrinfo test: no network?\n");
+         return 77;
+       }
+      /* IRIX reports EAI_NONAME for "https".  Don't fail the test
+        merely because of this.  */
+      if (res == EAI_NONAME)
+       return 0;
+      /* Solaris reports EAI_SERVICE for "http" and "https".  Don't
+        fail the test merely because of this.  */
+      if (res == EAI_SERVICE)
+       return 0;
+      /* AIX reports EAI_NODATA for "https".  Don't fail the test
+        merely because of this.  */
+      if (res == EAI_NODATA)
+       return 0;
+      /* Provide details if errno was set.  */
+      if (res == EAI_SYSTEM)
+       dbgprintf ("system error: %s\n", strerror (err));
+
+      return 1;
+    }
 
   for (ai = ai0; ai; ai = ai->ai_next)
     {
-      printf ("\tflags %x\n", ai->ai_flags);
-      printf ("\tfamily %x\n", ai->ai_family);
-      printf ("\tsocktype %x\n", ai->ai_socktype);
-      printf ("\tprotocol %x\n", ai->ai_protocol);
-      printf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
-      printf ("\tFound %s\n",
-             inet_ntop (ai->ai_family,
-                        &((struct sockaddr_in *)
-                         ai->ai_addr)->sin_addr,
-                        buf, sizeof (buf) - 1));
+      dbgprintf ("\tflags %x\n", ai->ai_flags);
+      dbgprintf ("\tfamily %x\n", ai->ai_family);
+      dbgprintf ("\tsocktype %x\n", ai->ai_socktype);
+      dbgprintf ("\tprotocol %x\n", ai->ai_protocol);
+      dbgprintf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen);
+      dbgprintf ("\tFound %s\n",
+                inet_ntop (ai->ai_family,
+                           &((struct sockaddr_in *)
+                             ai->ai_addr)->sin_addr,
+                           buf, sizeof (buf) - 1));
       if (ai->ai_canonname)
-       printf ("\tFound %s...\n", ai->ai_canonname);
+       dbgprintf ("\tFound %s...\n", ai->ai_canonname);
 
       {
        char ipbuf[BUFSIZ];
@@ -71,11 +124,11 @@ int simple (char *host, char *service)
                           ipbuf, sizeof (ipbuf) - 1,
                           portbuf, sizeof (portbuf) - 1,
                           NI_NUMERICHOST|NI_NUMERICSERV);
-       printf ("\t\tgetnameinfo %d: %s\n", res, gai_strerror (res));
+       dbgprintf ("\t\tgetnameinfo %d: %s\n", res, gai_strerror (res));
        if (res == 0)
          {
-           printf ("\t\tip %s\n", ipbuf);
-           printf ("\t\tport %s\n", portbuf);
+           dbgprintf ("\t\tip %s\n", ipbuf);
+           dbgprintf ("\t\tport %s\n", portbuf);
          }
       }