Fix build when libpsl is not available

[wget] / src / host.c

diff --git a/src/host.c b/src/host.c
index 505f706c02a75233593f6a6e134a085193019dcb..86bf83b3dfe04ccb6abcfeaa7ea5656248691ae0 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -1,6 +1,6 @@
 /* Host name resolution and matching.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
    Inc.
 
 This file is part of GNU Wget.
@@ -828,8 +828,8 @@ lookup_host (const char *host, int flags)
       int i;
       int printmax = al->count;
 
-      if (! opt.show_all_dns_entries)
-        printmax = 3;
+      if (!opt.show_all_dns_entries && printmax > 3)
+          printmax = 3;
 
       for (i = 0; i < printmax; i++)
         {
@@ -914,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;
+}