Bump version number in NEWS.

[wget] / src / host.c

diff --git a/src/host.c b/src/host.c
index df8bdda02385a91012f1a138496768fb297a4497..86f107a302bc57ae0f2767a806f09d3978424e9a 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, 2009, 2010 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
@@ -49,6 +50,8 @@ as that of the covered work.  */
 # 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 */
 
@@ -819,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));