Merging to bring en@*.po back in (and removed from .hgignore).

[wget] / src / connect.c

diff --git a/src/connect.c b/src/connect.c
index 11d6e193faa69fa3603bbf885404e22efdad9f0a..19cca8235b63d650f5e0fe16467b7b177c22e7d5 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -1,5 +1,6 @@
 /* Establishing and handling network connections.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -26,7 +27,7 @@ modify this file, you may extend this exception to your version of the
 file, but you are not obligated to do so.  If you do not wish to do
 so, delete this exception statement from your version.  */
 
-#include <config.h>
+#include "wget.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,8 +50,6 @@ so, delete this exception statement from your version.  */
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
-
-#include "wget.h"
 #include "utils.h"
 #include "host.h"
 #include "connect.h"
@@ -361,7 +360,12 @@ connect_to_host (const char *host, int port)
 
  retry:
   if (!al)
-    return E_HOST;
+    {
+      logprintf (LOG_NOTQUIET,
+                 _("%s: unable to resolve host address `%s'\n"),
+                 exec_name, host);
+      return E_HOST;
+    }
 
   address_list_get_bounds (al, &start, &end);
   for (i = start; i < end; i++)
@@ -668,7 +672,7 @@ test_socket_open (int sock)
 \f
 /* Basic socket operations, mostly EINTR wrappers.  */
 
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(MSDOS)
 # define read(fd, buf, cnt) recv (fd, buf, cnt, 0)
 # define write(fd, buf, cnt) send (fd, buf, cnt, 0)
 # define close(fd) closesocket (fd)