Fix build when libpsl is not available

[wget] / src / host.c

diff --git a/src/host.c b/src/host.c
index b9aaebb45c713e43e31f97805421bc65218143ae..86bf83b3dfe04ccb6abcfeaa7ea5656248691ae0 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -1,6 +1,7 @@
 /* Host name resolution and matching.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
@@ -42,9 +43,15 @@ as that of the covered work.  */
 # ifndef __BEOS__
 #  include <arpa/inet.h>
 # endif
-# include <netdb.h>
+# ifdef __VMS
+#  include "vms_ip.h"
+# else /* def __VMS */
+#  include <netdb.h>
+# endif /* def __VMS [else] */
 # define SET_H_ERRNO(err) ((void)(h_errno = (err)))
 #else  /* WINDOWS */
+# include <winsock2.h>
+# include <ws2tcpip.h>
 # define SET_H_ERRNO(err) WSASetLastError (err)
 #endif /* WINDOWS */
 
@@ -59,7 +66,7 @@ as that of the covered work.  */
 # define NO_ADDRESS NO_DATA
 #endif
 
-#if !HAVE_DECL_H_ERRNO
+#if !HAVE_DECL_H_ERRNO && !defined(WINDOWS)
 extern int h_errno;
 #endif
 
@@ -198,7 +205,7 @@ address_list_from_addrinfo (const struct addrinfo *ai)
 
   ip = al->addresses;
   for (ptr = ai; ptr != NULL; ptr = ptr->ai_next)
-    if (ptr->ai_family == AF_INET6) 
+    if (ptr->ai_family == AF_INET6)
       {
         const struct sockaddr_in6 *sin6 =
           (const struct sockaddr_in6 *)ptr->ai_addr;
@@ -208,7 +215,7 @@ address_list_from_addrinfo (const struct addrinfo *ai)
         ip->ipv6_scope = sin6->sin6_scope_id;
 #endif
         ++ip;
-      } 
+      }
     else if (ptr->ai_family == AF_INET)
       {
         const struct sockaddr_in *sin =
@@ -341,7 +348,7 @@ gethostbyname_with_timeout (const char *host_name, double timeout)
 }
 
 /* Print error messages for host errors.  */
-static char *
+static const char *
 host_errstr (int error)
 {
   /* Can't use switch since some of these constants can be equal,
@@ -458,7 +465,7 @@ is_valid_ipv4_address (const char *str, const char *end)
     }
   if (octets < 4)
     return false;
-  
+
   return true;
 }
 
@@ -483,7 +490,7 @@ is_valid_ipv6_address (const char *str, const char *end)
 
   if (str == end)
     return false;
-  
+
   /* Leading :: requires some special handling. */
   if (*str == ':')
     {
@@ -540,20 +547,20 @@ is_valid_ipv6_address (const char *str, const char *end)
           saw_xdigit = false;
           break;
         }
-    
+
       return false;
     }
 
   if (saw_xdigit)
     {
-      if (tp > ns_in6addrsz - ns_int16sz) 
+      if (tp > ns_in6addrsz - ns_int16sz)
         return false;
       tp += ns_int16sz;
     }
 
   if (colonp != NULL)
     {
-      if (tp == ns_in6addrsz) 
+      if (tp == ns_in6addrsz)
         return false;
       tp = ns_in6addrsz;
     }
@@ -815,11 +822,15 @@ lookup_host (const char *host, int flags)
 #endif /* not ENABLE_IPV6 */
 
   /* Print the addresses determined by DNS lookup, but no more than
-     three.  */
+     three if show_all_dns_entries is not specified.  */
   if (!silent && !numeric_address)
     {
       int i;
-      int printmax = al->count <= 3 ? al->count : 3;
+      int printmax = al->count;
+
+      if (!opt.show_all_dns_entries && printmax > 3)
+          printmax = 3;
+
       for (i = 0; i < printmax; i++)
         {
           logputs (LOG_VERBOSE, print_address (al->addresses + i));
@@ -870,6 +881,9 @@ sufmatch (const char **list, const char *what)
   lw = strlen (what);
   for (i = 0; list[i]; i++)
     {
+      if (list[i][0] == '\0')
+        continue;
+
       for (j = strlen (list[i]), k = lw; j >= 0 && k >= 0; j--, k--)
         if (c_tolower (list[i][j]) != c_tolower (what[k]))
           break;
@@ -900,3 +914,18 @@ host_cleanup (void)
       host_name_addresses_map = NULL;
     }
 }
+
+bool
+is_valid_ip_address (const char *name)
+{
+  const char *endp;
+
+  endp = name + strlen(name);
+  if (is_valid_ipv4_address (name, endp))
+    return true;
+#ifdef ENABLE_IPV6
+  if (is_valid_ipv6_address (name, endp))
+    return true;
+#endif
+  return false;
+}