config.h.mingw changes

Gisle Vanem <[email protected]> Wed, 29 Jun 2005 15:25:12 +0200
Newsgroups gmane.comp.web.wget.patches
Message-ID <[email protected]>
Some patches for MingW that I feel are needed;

MingW 3.7 (or older?) have an 'uint32_t'.
Where is config-post.h supposed to be included? We need the
prototype for alloca() from <malloc.h>. AFAICS, configure attaches it
at end of src/config.h, but configure.bat does not.

diff -u SVN-Latest\windows\config.h.mingw \windows\config.h.mingw
--- SVN-Latest\windows\config.h.mingw        Wed Jun 29 13:52:53 2005
+++ windows\config.h.mingw   Wed Jun 29 14:28:24 2005
@@ -177,6 +177,9 @@
 /* Define if you have the usleep function.  */
 /* #undef HAVE_USLEEP */

+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H
+
 /* Define if you have the <string.h> header file.  */
 #define HAVE_STRING_H 1

@@ -256,7 +259,7 @@
 /* #undef HAVE_HAVE_STRUCT_SOCKADDR_IN6 */

 /* Define if struct sockaddr_in6 has the sin6_scope_id member */
-/* #undef HAVE_SOCKADDR_IN6_SCOPE_ID */
+#define HAVE_SOCKADDR_IN6_SCOPE_ID

 /* Define if you want to enable the IPv6 support.  */
 /* #undef ENABLE_IPV6 */
@@ -265,6 +268,8 @@
 #define socklen_t int

 /* Define if you have uint32_t.  */
-#undef HAVE_UINT32_T
+#define HAVE_UINT32_T
+
+#include "config-post.h"

 #endif /* CONFIG_H */

-----------

PS. I said earlier that the Win32 version works for ENABLE_IPV6.
Not quite true w/o the attached host6.c file since Winsock doesn't
have a inet_ntop() function. Feel free to add it to host.c.

--gv
host6.c (application/octet-stream, 4.1 KB)
/*
 * host6.c -- implements inet_ntop().
 * Original code by Paul Vixie. Modified by Gisle Vanem.
 */

#include <config.h>

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>

#include "wget.h"

#ifndef HAVE_INET_NTOP   /* rest of file */

#ifndef IN6ADDRSZ
#define IN6ADDRSZ   16   /* IPv6 T_AAAA */
#endif

#ifndef INT16SZ
#define INT16SZ     2    /* word size */
#endif

#if defined(WINDOWS) && !defined(__CYGWIN__)
# define SET_ERRNO(e) WSASetLastError (WSA ## e)
#else
# define SET_ERRNO(e) errno = e
#endif

/*
 * Format an IPv4 address, more or less like inet_ntoa().
 *
 * Returns `dst' (as a const)
 * Note:
 *  - uses no statics
 *  - takes a u_char* not an in_addr as input
 */
static const char *
inet_ntop4 (const u_char *src, char *dst, size_t size)
{
  char tmp [sizeof("255.255.255.255")];

  if ((size_t)sprintf(tmp,"%u.%u.%u.%u",src[0],src[1],src[2],src[3]) > size)
  {
    errno = ENOSPC;
    return (NULL);
  }
  return strcpy (dst, tmp);
}

#ifdef ENABLE_IPV6
/*
 * Convert IPv6 binary address into presentation (printable) format.
 */
static const char *
inet_ntop6 (const u_char *src, char *dst, size_t size)
{
  /*
   * Note that int32_t and int16_t need only be "at least" large enough
   * to contain a value of the specified size.  On some systems, like
   * Crays, there is no such thing as an integer variable with 16 bits.
   * Keep this in mind if you think this function should have been coded
   * to use pointer overlays.  All the world's not a VAX.
   */
  char  tmp [sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
  char *tp;
  struct {
    long base;
    long len;
  } best, cur;
  u_long words [IN6ADDRSZ / INT16SZ];
  int    i;

  /* Preprocess:
   *  Copy the input (bytewise) array into a wordwise array.
   *  Find the longest run of 0x00's in src[] for :: shorthanding.
   */
  memset (words, 0, sizeof(words));
  for (i = 0; i < IN6ADDRSZ; i++)
      words[i/2] |= (src[i] << ((1 - (i % 2)) << 3));

  best.base = -1;
  cur.base  = -1;
  for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++)
  {
    if (words[i] == 0)
    {
      if (cur.base == -1)
           cur.base = i, cur.len = 1;
      else cur.len++;
    }
    else if (cur.base != -1)
    {
      if (best.base == -1 || cur.len > best.len)
         best = cur;
      cur.base = -1;
    }
  }
  if ((cur.base != -1) && (best.base == -1 || cur.len > best.len))
     best = cur;
  if (best.base != -1 && best.len < 2)
     best.base = -1;

  /* Format the result.
   */
  tp = tmp;
  for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++)
  {
    /* Are we inside the best run of 0x00's?
     */
    if (best.base != -1 && i >= best.base && i < (best.base + best.len))
    {
      if (i == best.base)
         *tp++ = ':';
      continue;
    }

    /* Are we following an initial run of 0x00s or any real hex?
     */
    if (i != 0)
       *tp++ = ':';

    /* Is this address an encapsulated IPv4?
     */
    if (i == 6 && best.base == 0 &&
        (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
    {
      if (!inet_ntop4(src+12, tp, sizeof(tmp) - (tp - tmp)))
      {
        errno = ENOSPC;
        return (NULL);
      }
      tp += strlen(tp);
      break;
    }
    tp += sprintf (tp, "%lX", words[i]);
  }

  /* Was it a trailing run of 0x00's?
   */
  if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))
     *tp++ = ':';
  *tp++ = '\0';

  /* Check for overflow, copy, and we're done.
   */
  if ((size_t)(tp - tmp) > size)
  {
    errno = ENOSPC;
    return (NULL);
  }
  return strcpy (dst, tmp);
  return (NULL);
}
#endif  /* ENABLE_IPV6 */

/*
 * Convert a network format address to presentation format.
 *
 * Returns pointer to presentation format address (`dst'),
 * Returns NULL on error (see errno).
 */
const char *
inet_ntop (int af, const void *src, char *dst, size_t size)
{
  switch (af)
  {
    case AF_INET:
         return inet_ntop4 ((const u_char*)src, dst, size);
#ifdef ENABLE_IPV6
    case AF_INET6:
         return inet_ntop6 ((const u_char*)src, dst, size);
#endif
    default:
         SET_ERRNO (EAFNOSUPPORT);
         return (NULL);
  }
}
#endif  /* !HAVE_INET_NTOP */