[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / mswindows.c

diff --git a/src/mswindows.c b/src/mswindows.c
index d9942347216e4478448a5004e566b9cd70ade6c6..3aeafa33b9d62bed495d352238e571e43cfaf0a1 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -1,11 +1,11 @@
 /* mswindows.c -- Windows-specific support
 /* mswindows.c -- Windows-specific support

-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -36,17 +35,6 @@ so, delete this exception statement from your version.  */
 #include <errno.h>
 #include <math.h>
 
 #include <errno.h>
 #include <math.h>
 

-#ifdef HACK_BCC_UTIME_BUG
-# include <io.h>
-# include <fcntl.h>
-# ifdef HAVE_UTIME_H
-#  include <utime.h>
-# endif
-# ifdef HAVE_SYS_UTIME_H
-#  include <sys/utime.h>
-# endif
-#endif
-

 #define INHIBIT_WRAP /* avoid wrapping of socket, bind, ... */
 
 #include "wget.h"
 #define INHIBIT_WRAP /* avoid wrapping of socket, bind, ... */
 
 #include "wget.h"


@@ -77,135 +65,12 @@ xsleep (double seconds)
       sleep (seconds);
       seconds -= (long) seconds;
     }
       sleep (seconds);
       seconds -= (long) seconds;
     }

-  usleep (seconds * 1000000L);
+  usleep (seconds * 1000000);

 #else  /* not HAVE_USLEEP */
   SleepEx ((DWORD) (seconds * 1000 + .5), FALSE);
 #endif /* not HAVE_USLEEP */
 }
 
 #else  /* not HAVE_USLEEP */
   SleepEx ((DWORD) (seconds * 1000 + .5), FALSE);
 #endif /* not HAVE_USLEEP */
 }
 

-#if defined(__BORLANDC__) || (defined(_MSC_VER) && _MSC_VER < 1300)
-
-static inline int
-char_value (char c, int base)
-{
-  int value;
-  if (c < '0')
-    return -1;
-  if ('0' <= c && c <= '9')
-    value = c - '0';
-  else if ('a' <= c && c <= 'z')
-    value = c - 'a' + 10;
-  else if ('A' <= c && c <= 'Z')
-    value = c - 'A' + 10;
-  else
-    return -1;
-  if (value >= base)
-    return -1;
-  return value;
-}
-
-/* A fairly simple strtoll replacement for MS VC versions that don't
-   supply _strtoi64.  */
-
-__int64
-str_to_int64 (const char *nptr, char **endptr, int base)
-{
-#define INT64_OVERFLOW 9223372036854775807I64
-#define INT64_UNDERFLOW (-INT64_OVERFLOW - 1)
-
-  __int64 result = 0;
-  bool negative;
-
-  if (base != 0 && (base < 2 || base > 36))
-    {
-      errno = EINVAL;
-      return 0;
-    }
-
-  while (*nptr == ' ' || *nptr == '\t')
-    ++nptr;
-  if (*nptr == '-')
-    {
-      negative = true;
-      ++nptr;
-    }
-  else if (*nptr == '+')
-    {
-      negative = false;
-      ++nptr;
-    }
-  else
-    negative = false;
-
-  /* If base is 0, determine the real base based on the beginning on
-     the number; octal numbers begin with "0", hexadecimal with "0x",
-     and the others are considered octal.  */
-  if (*nptr == '0')
-    {
-      if ((base == 0 || base == 16)
-         &&
-         (*(nptr + 1) == 'x' || *(nptr + 1) == 'X'))
-       {
-         base = 16;
-         nptr += 2;
-       }
-      else if (base == 0)
-       base = 8;
-    }
-  else if (base == 0)
-    base = 10;
-
-  if (!negative)
-    {
-      /* Parse positive number, checking for overflow. */
-      int val;
-      for (; (val = char_value (*nptr, base)) != -1; ++nptr)
-       {
-         __int64 newresult = base * result + val;
-         if (newresult < result)
-           {
-             result = INT64_OVERFLOW;
-             errno = ERANGE;
-             break;
-           }
-         result = newresult;
-       }
-    }
-  else
-    {
-      /* Parse negative number, checking for underflow. */
-      int val;
-      for (; (val = char_value (*nptr, base)) != -1; ++nptr)
-       {
-         __int64 newresult = base * result - val;
-         if (newresult > result)
-           {
-             result = INT64_UNDERFLOW;
-             errno = ERANGE;
-             break;
-           }
-         result = newresult;
-       }
-    }
-  if (endptr)
-    *endptr = (char *) nptr;
-  return result;
-}
-
-#else  /* !defined(__BORLANDC__) && (!defined(_MSC_VER) || _MSC_VER >= 1300) */
-
-__int64
-str_to_int64 (const char *nptr, char **endptr, int base)
-{
-#ifdef _MSC_VER
-  return _strtoi64 (nptr, endptr, base);
-#else
-  return strtoll (nptr, endptr, base);
-#endif
-}
-
-#endif /* !defined(__BORLANDC__) && (!defined(_MSC_VER) || _MSC_VER >= 1300) */
-

 void
 windows_main (int *argc, char **argv, char **exec_name)
 {
 void
 windows_main (int *argc, char **argv, char **exec_name)
 {


@@ -224,6 +89,7 @@ ws_cleanup (void)
   WSACleanup ();
 }
 
   WSACleanup ();
 }
 

+#if defined(CTRLBREAK_BACKGND) || defined(CTRLC_BACKGND)

 static void
 ws_hangup (const char *reason)
 {
 static void
 ws_hangup (const char *reason)
 {


@@ -237,6 +103,7 @@ ws_hangup (const char *reason)
      gesture as the parent will wait for us to terminate before resuming.  */
   FreeConsole ();
 }
      gesture as the parent will wait for us to terminate before resuming.  */
   FreeConsole ();
 }

+#endif

 
 /* Construct the name for a named section (a.k.a. `file mapping') object.
    The returned string is dynamically allocated and needs to be xfree()'d.  */
 
 /* Construct the name for a named section (a.k.a. `file mapping') object.
    The returned string is dynamically allocated and needs to be xfree()'d.  */


@@ -606,34 +473,6 @@ ws_startup (void)
   set_sleep_mode ();
   SetConsoleCtrlHandler (ws_handler, TRUE);
 }
   set_sleep_mode ();
   SetConsoleCtrlHandler (ws_handler, TRUE);
 }

-
-/* Replacement utime function for buggy Borland C++Builder 5.5 compiler.
-   (The Borland utime function only works on Windows NT.)  */
-
-#ifdef HACK_BCC_UTIME_BUG
-int
-borland_utime (const char *path, const struct utimbuf *times)
-{
-  int fd;
-  int res;
-  struct ftime ft;
-  struct tm *ptr_tm;
-
-  if ((fd = open (path, O_RDWR)) < 0)
-    return -1;
-
-  ptr_tm = localtime (&times->modtime);
-  ft.ft_tsec = ptr_tm->tm_sec >> 1;
-  ft.ft_min = ptr_tm->tm_min;
-  ft.ft_hour = ptr_tm->tm_hour;
-  ft.ft_day = ptr_tm->tm_mday;
-  ft.ft_month = ptr_tm->tm_mon + 1;
-  ft.ft_year = ptr_tm->tm_year - 80;
-  res = setftime (fd, &ft);
-  close (fd);
-  return res;
-}
-#endif

 \f
 /* run_with_timeout Windows implementation.  */
 
 \f
 /* run_with_timeout Windows implementation.  */
 


@@ -685,7 +524,7 @@ thread_helper (void *arg)
 bool
 run_with_timeout (double seconds, void (*fun) (void *), void *arg)
 {
 bool
 run_with_timeout (double seconds, void (*fun) (void *), void *arg)
 {

-  static HANDLE thread_hnd = NULL;
+  HANDLE thread_hnd;

   struct thread_data thread_arg;
   DWORD thread_id;
   bool rc;
   struct thread_data thread_arg;
   DWORD thread_id;
   bool rc;


@@ -699,9 +538,6 @@ run_with_timeout (double seconds, void (*fun) (void *), void *arg)
       return false;
     }
 
       return false;
     }
 

-  /* Should never happen, but test for recursivety anyway.  */
-  assert (thread_hnd == NULL);
-

   thread_arg.fun = fun;
   thread_arg.arg = arg;
   thread_arg.ws_error = WSAGetLastError ();
   thread_arg.fun = fun;
   thread_arg.arg = arg;
   thread_arg.ws_error = WSAGetLastError ();


@@ -851,22 +687,39 @@ windows_strerror (int err)
 }
 \f
 #ifdef ENABLE_IPV6
 }
 \f
 #ifdef ENABLE_IPV6

-/* An IPv6-only inet_ntop that prints with WSAAddressToString.  (Wget
-   uses inet_ntoa for IPv4 addresses -- see print_address.)  Prototype
-   complies with POSIX 1003.1-2004.  */
+/* An inet_ntop implementation that uses WSAAddressToString.
+   Prototype complies with POSIX 1003.1-2004.  This is only used under
+   IPv6 because Wget prints IPv4 addresses using inet_ntoa.  */

 
 const char *
 inet_ntop (int af, const void *src, char *dst, socklen_t cnt)
 {
 
 const char *
 inet_ntop (int af, const void *src, char *dst, socklen_t cnt)
 {

-  struct sockaddr_in6 sin6;
+  /* struct sockaddr can't accomodate struct sockaddr_in6. */
+  union {
+    struct sockaddr_in6 sin6;
+    struct sockaddr_in sin;
+  } sa;

   DWORD dstlen = cnt;
   DWORD dstlen = cnt;

+  size_t srcsize;
+
+  xzero (sa);
+  switch (af)
+    {
+    case AF_INET:
+      sa.sin.sin_family = AF_INET;
+      sa.sin.sin_addr = *(struct in_addr *) src;
+      srcsize = sizeof (sa.sin);
+      break;
+    case AF_INET6:
+      sa.sin6.sin6_family = AF_INET6;
+      sa.sin6.sin6_addr = *(struct in6_addr *) src;
+      srcsize = sizeof (sa.sin6);
+      break;
+    default:
+      abort ();
+    }

 
 

-  assert (af == AF_INET6);
-  xzero (sin6);
-  sin6.sin6_family = AF_INET6;
-  sin6.sin6_addr = *(struct in6_addr *) src;
-  if (WSAAddressToString ((struct sockaddr *) &sin6, sizeof (sin6),
-                          NULL, dst, &dstlen) != 0)
+  if (WSAAddressToString ((struct sockaddr *) &sa, srcsize, NULL, dst, &dstlen) != 0)

     {
       errno = WSAGetLastError();
       return NULL;
     {
       errno = WSAGetLastError();
       return NULL;