Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 2 of 2.

1 files changed, 443 insertions, 443 deletions

diff --git a/contrib/libs/curl/lib/curl_addrinfo.c b/contrib/libs/curl/lib/curl_addrinfo.c
index 3bdb86f568..9007259d4c 100644
--- a/contrib/libs/curl/lib/curl_addrinfo.c
+++ b/contrib/libs/curl/lib/curl_addrinfo.c
@@ -1,466 +1,466 @@
-/*************************************************************************** 
- *                                  _   _ ____  _ 
- *  Project                     ___| | | |  _ \| | 
- *                             / __| | | | |_) | | 
- *                            | (__| |_| |  _ <| |___ 
- *                             \___|\___/|_| \_\_____| 
- * 
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
  * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
- * 
- * This software is licensed as described in the file COPYING, which 
- * you should have received as part of this distribution. The terms 
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
  * are also available at https://curl.se/docs/copyright.html.
- * 
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell 
- * copies of the Software, and permit persons to whom the Software is 
- * furnished to do so, under the terms of the COPYING file. 
- * 
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY 
- * KIND, either express or implied. 
- * 
- ***************************************************************************/ 
- 
-#include "curl_setup.h" 
- 
-#include <curl/curl.h> 
- 
-#ifdef HAVE_NETINET_IN_H 
-#  include <netinet/in.h> 
-#endif 
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+#include "curl_setup.h"
+
+#include <curl/curl.h>
+
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
 #ifdef HAVE_NETINET_IN6_H
 #  error #include <netinet/in6.h>
 #endif
-#ifdef HAVE_NETDB_H 
-#  include <netdb.h> 
-#endif 
-#ifdef HAVE_ARPA_INET_H 
-#  include <arpa/inet.h> 
-#endif 
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+#endif
 #ifdef HAVE_SYS_UN_H
 #  include <sys/un.h>
 #endif
- 
-#ifdef __VMS 
-#  include <in.h> 
-#  include <inet.h> 
-#endif 
- 
-#if defined(NETWARE) && defined(__NOVELL_LIBC__) 
-#  undef  in_addr_t 
-#  define in_addr_t unsigned long 
-#endif 
- 
+
+#ifdef __VMS
+#  include <in.h>
+#  include <inet.h>
+#endif
+
+#if defined(NETWARE) && defined(__NOVELL_LIBC__)
+#  undef  in_addr_t
+#  define in_addr_t unsigned long
+#endif
+
 #include <stddef.h>
 
-#include "curl_addrinfo.h" 
-#include "inet_pton.h" 
-#include "warnless.h" 
+#include "curl_addrinfo.h"
+#include "inet_pton.h"
+#include "warnless.h"
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
-#include "curl_memory.h" 
-#include "memdebug.h" 
- 
-/* 
- * Curl_freeaddrinfo() 
- * 
- * This is used to free a linked list of Curl_addrinfo structs along 
- * with all its associated allocated storage. This function should be 
- * called once for each successful call to Curl_getaddrinfo_ex() or to 
- * any function call which actually allocates a Curl_addrinfo struct. 
- */ 
- 
-#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \ 
-    defined(__OPTIMIZE__) && defined(__unix__) &&  defined(__i386__) 
-  /* workaround icc 9.1 optimizer issue */ 
-# define vqualifier volatile 
-#else 
-# define vqualifier 
-#endif 
- 
-void 
+#include "curl_memory.h"
+#include "memdebug.h"
+
+/*
+ * Curl_freeaddrinfo()
+ *
+ * This is used to free a linked list of Curl_addrinfo structs along
+ * with all its associated allocated storage. This function should be
+ * called once for each successful call to Curl_getaddrinfo_ex() or to
+ * any function call which actually allocates a Curl_addrinfo struct.
+ */
+
+#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
+    defined(__OPTIMIZE__) && defined(__unix__) &&  defined(__i386__)
+  /* workaround icc 9.1 optimizer issue */
+# define vqualifier volatile
+#else
+# define vqualifier
+#endif
+
+void
 Curl_freeaddrinfo(struct Curl_addrinfo *cahead)
-{ 
+{
   struct Curl_addrinfo *vqualifier canext;
   struct Curl_addrinfo *ca;
- 
+
   for(ca = cahead; ca; ca = canext) {
-    canext = ca->ai_next; 
-    free(ca); 
-  } 
-} 
- 
- 
-#ifdef HAVE_GETADDRINFO 
-/* 
- * Curl_getaddrinfo_ex() 
- * 
- * This is a wrapper function around system's getaddrinfo(), with 
- * the only difference that instead of returning a linked list of 
- * addrinfo structs this one returns a linked list of Curl_addrinfo 
- * ones. The memory allocated by this function *MUST* be free'd with 
- * Curl_freeaddrinfo().  For each successful call to this function 
- * there must be an associated call later to Curl_freeaddrinfo(). 
- * 
- * There should be no single call to system's getaddrinfo() in the 
- * whole library, any such call should be 'routed' through this one. 
- */ 
- 
-int 
-Curl_getaddrinfo_ex(const char *nodename, 
-                    const char *servname, 
-                    const struct addrinfo *hints, 
+    canext = ca->ai_next;
+    free(ca);
+  }
+}
+
+
+#ifdef HAVE_GETADDRINFO
+/*
+ * Curl_getaddrinfo_ex()
+ *
+ * This is a wrapper function around system's getaddrinfo(), with
+ * the only difference that instead of returning a linked list of
+ * addrinfo structs this one returns a linked list of Curl_addrinfo
+ * ones. The memory allocated by this function *MUST* be free'd with
+ * Curl_freeaddrinfo().  For each successful call to this function
+ * there must be an associated call later to Curl_freeaddrinfo().
+ *
+ * There should be no single call to system's getaddrinfo() in the
+ * whole library, any such call should be 'routed' through this one.
+ */
+
+int
+Curl_getaddrinfo_ex(const char *nodename,
+                    const char *servname,
+                    const struct addrinfo *hints,
                     struct Curl_addrinfo **result)
-{ 
-  const struct addrinfo *ai; 
-  struct addrinfo *aihead; 
+{
+  const struct addrinfo *ai;
+  struct addrinfo *aihead;
   struct Curl_addrinfo *cafirst = NULL;
   struct Curl_addrinfo *calast = NULL;
   struct Curl_addrinfo *ca;
-  size_t ss_size; 
-  int error; 
- 
-  *result = NULL; /* assume failure */ 
- 
-  error = getaddrinfo(nodename, servname, hints, &aihead); 
-  if(error) 
-    return error; 
- 
-  /* traverse the addrinfo list */ 
- 
-  for(ai = aihead; ai != NULL; ai = ai->ai_next) { 
+  size_t ss_size;
+  int error;
+
+  *result = NULL; /* assume failure */
+
+  error = getaddrinfo(nodename, servname, hints, &aihead);
+  if(error)
+    return error;
+
+  /* traverse the addrinfo list */
+
+  for(ai = aihead; ai != NULL; ai = ai->ai_next) {
     size_t namelen = ai->ai_canonname ? strlen(ai->ai_canonname) + 1 : 0;
-    /* ignore elements with unsupported address family, */ 
-    /* settle family-specific sockaddr structure size.  */ 
-    if(ai->ai_family == AF_INET) 
-      ss_size = sizeof(struct sockaddr_in); 
-#ifdef ENABLE_IPV6 
-    else if(ai->ai_family == AF_INET6) 
-      ss_size = sizeof(struct sockaddr_in6); 
-#endif 
-    else 
-      continue; 
- 
-    /* ignore elements without required address info */ 
-    if((ai->ai_addr == NULL) || !(ai->ai_addrlen > 0)) 
-      continue; 
- 
-    /* ignore elements with bogus address size */ 
-    if((size_t)ai->ai_addrlen < ss_size) 
-      continue; 
- 
+    /* ignore elements with unsupported address family, */
+    /* settle family-specific sockaddr structure size.  */
+    if(ai->ai_family == AF_INET)
+      ss_size = sizeof(struct sockaddr_in);
+#ifdef ENABLE_IPV6
+    else if(ai->ai_family == AF_INET6)
+      ss_size = sizeof(struct sockaddr_in6);
+#endif
+    else
+      continue;
+
+    /* ignore elements without required address info */
+    if((ai->ai_addr == NULL) || !(ai->ai_addrlen > 0))
+      continue;
+
+    /* ignore elements with bogus address size */
+    if((size_t)ai->ai_addrlen < ss_size)
+      continue;
+
     ca = malloc(sizeof(struct Curl_addrinfo) + ss_size + namelen);
     if(!ca) {
-      error = EAI_MEMORY; 
-      break; 
-    } 
- 
-    /* copy each structure member individually, member ordering, */ 
-    /* size, or padding might be different for each platform.    */ 
- 
-    ca->ai_flags     = ai->ai_flags; 
-    ca->ai_family    = ai->ai_family; 
-    ca->ai_socktype  = ai->ai_socktype; 
-    ca->ai_protocol  = ai->ai_protocol; 
-    ca->ai_addrlen   = (curl_socklen_t)ss_size; 
-    ca->ai_addr      = NULL; 
-    ca->ai_canonname = NULL; 
-    ca->ai_next      = NULL; 
- 
+      error = EAI_MEMORY;
+      break;
+    }
+
+    /* copy each structure member individually, member ordering, */
+    /* size, or padding might be different for each platform.    */
+
+    ca->ai_flags     = ai->ai_flags;
+    ca->ai_family    = ai->ai_family;
+    ca->ai_socktype  = ai->ai_socktype;
+    ca->ai_protocol  = ai->ai_protocol;
+    ca->ai_addrlen   = (curl_socklen_t)ss_size;
+    ca->ai_addr      = NULL;
+    ca->ai_canonname = NULL;
+    ca->ai_next      = NULL;
+
     ca->ai_addr = (void *)((char *)ca + sizeof(struct Curl_addrinfo));
-    memcpy(ca->ai_addr, ai->ai_addr, ss_size); 
- 
+    memcpy(ca->ai_addr, ai->ai_addr, ss_size);
+
     if(namelen) {
       ca->ai_canonname = (void *)((char *)ca->ai_addr + ss_size);
       memcpy(ca->ai_canonname, ai->ai_canonname, namelen);
-    } 
- 
-    /* if the return list is empty, this becomes the first element */ 
-    if(!cafirst) 
-      cafirst = ca; 
- 
-    /* add this element last in the return list */ 
-    if(calast) 
-      calast->ai_next = ca; 
-    calast = ca; 
- 
-  } 
- 
-  /* destroy the addrinfo list */ 
-  if(aihead) 
-    freeaddrinfo(aihead); 
- 
-  /* if we failed, also destroy the Curl_addrinfo list */ 
-  if(error) { 
-    Curl_freeaddrinfo(cafirst); 
-    cafirst = NULL; 
-  } 
-  else if(!cafirst) { 
-#ifdef EAI_NONAME 
-    /* rfc3493 conformant */ 
-    error = EAI_NONAME; 
-#else 
-    /* rfc3493 obsoleted */ 
-    error = EAI_NODATA; 
-#endif 
-#ifdef USE_WINSOCK 
-    SET_SOCKERRNO(error); 
-#endif 
-  } 
- 
-  *result = cafirst; 
- 
-  /* This is not a CURLcode */ 
-  return error; 
-} 
-#endif /* HAVE_GETADDRINFO */ 
- 
- 
-/* 
- * Curl_he2ai() 
- * 
- * This function returns a pointer to the first element of a newly allocated 
- * Curl_addrinfo struct linked list filled with the data of a given hostent. 
- * Curl_addrinfo is meant to work like the addrinfo struct does for a IPv6 
- * stack, but usable also for IPv4, all hosts and environments. 
- * 
- * The memory allocated by this function *MUST* be free'd later on calling 
- * Curl_freeaddrinfo().  For each successful call to this function there 
- * must be an associated call later to Curl_freeaddrinfo(). 
- * 
- *   Curl_addrinfo defined in "lib/curl_addrinfo.h" 
- * 
- *     struct Curl_addrinfo { 
- *       int                   ai_flags; 
- *       int                   ai_family; 
- *       int                   ai_socktype; 
- *       int                   ai_protocol; 
- *       curl_socklen_t        ai_addrlen;   * Follow rfc3493 struct addrinfo * 
- *       char                 *ai_canonname; 
- *       struct sockaddr      *ai_addr; 
- *       struct Curl_addrinfo *ai_next; 
- *     }; 
- * 
- *   hostent defined in <netdb.h> 
- * 
- *     struct hostent { 
- *       char    *h_name; 
- *       char    **h_aliases; 
- *       int     h_addrtype; 
- *       int     h_length; 
- *       char    **h_addr_list; 
- *     }; 
- * 
- *   for backward compatibility: 
- * 
- *     #define h_addr  h_addr_list[0] 
- */ 
- 
+    }
+
+    /* if the return list is empty, this becomes the first element */
+    if(!cafirst)
+      cafirst = ca;
+
+    /* add this element last in the return list */
+    if(calast)
+      calast->ai_next = ca;
+    calast = ca;
+
+  }
+
+  /* destroy the addrinfo list */
+  if(aihead)
+    freeaddrinfo(aihead);
+
+  /* if we failed, also destroy the Curl_addrinfo list */
+  if(error) {
+    Curl_freeaddrinfo(cafirst);
+    cafirst = NULL;
+  }
+  else if(!cafirst) {
+#ifdef EAI_NONAME
+    /* rfc3493 conformant */
+    error = EAI_NONAME;
+#else
+    /* rfc3493 obsoleted */
+    error = EAI_NODATA;
+#endif
+#ifdef USE_WINSOCK
+    SET_SOCKERRNO(error);
+#endif
+  }
+
+  *result = cafirst;
+
+  /* This is not a CURLcode */
+  return error;
+}
+#endif /* HAVE_GETADDRINFO */
+
+
+/*
+ * Curl_he2ai()
+ *
+ * This function returns a pointer to the first element of a newly allocated
+ * Curl_addrinfo struct linked list filled with the data of a given hostent.
+ * Curl_addrinfo is meant to work like the addrinfo struct does for a IPv6
+ * stack, but usable also for IPv4, all hosts and environments.
+ *
+ * The memory allocated by this function *MUST* be free'd later on calling
+ * Curl_freeaddrinfo().  For each successful call to this function there
+ * must be an associated call later to Curl_freeaddrinfo().
+ *
+ *   Curl_addrinfo defined in "lib/curl_addrinfo.h"
+ *
+ *     struct Curl_addrinfo {
+ *       int                   ai_flags;
+ *       int                   ai_family;
+ *       int                   ai_socktype;
+ *       int                   ai_protocol;
+ *       curl_socklen_t        ai_addrlen;   * Follow rfc3493 struct addrinfo *
+ *       char                 *ai_canonname;
+ *       struct sockaddr      *ai_addr;
+ *       struct Curl_addrinfo *ai_next;
+ *     };
+ *
+ *   hostent defined in <netdb.h>
+ *
+ *     struct hostent {
+ *       char    *h_name;
+ *       char    **h_aliases;
+ *       int     h_addrtype;
+ *       int     h_length;
+ *       char    **h_addr_list;
+ *     };
+ *
+ *   for backward compatibility:
+ *
+ *     #define h_addr  h_addr_list[0]
+ */
+
 struct Curl_addrinfo *
-Curl_he2ai(const struct hostent *he, int port) 
-{ 
+Curl_he2ai(const struct hostent *he, int port)
+{
   struct Curl_addrinfo *ai;
   struct Curl_addrinfo *prevai = NULL;
   struct Curl_addrinfo *firstai = NULL;
-  struct sockaddr_in *addr; 
-#ifdef ENABLE_IPV6 
-  struct sockaddr_in6 *addr6; 
-#endif 
-  CURLcode result = CURLE_OK; 
-  int i; 
-  char *curr; 
- 
-  if(!he) 
-    /* no input == no output! */ 
-    return NULL; 
- 
-  DEBUGASSERT((he->h_name != NULL) && (he->h_addr_list != NULL)); 
- 
+  struct sockaddr_in *addr;
+#ifdef ENABLE_IPV6
+  struct sockaddr_in6 *addr6;
+#endif
+  CURLcode result = CURLE_OK;
+  int i;
+  char *curr;
+
+  if(!he)
+    /* no input == no output! */
+    return NULL;
+
+  DEBUGASSERT((he->h_name != NULL) && (he->h_addr_list != NULL));
+
   for(i = 0; (curr = he->h_addr_list[i]) != NULL; i++) {
-    size_t ss_size; 
+    size_t ss_size;
     size_t namelen = strlen(he->h_name) + 1; /* include zero termination */
-#ifdef ENABLE_IPV6 
-    if(he->h_addrtype == AF_INET6) 
+#ifdef ENABLE_IPV6
+    if(he->h_addrtype == AF_INET6)
       ss_size = sizeof(struct sockaddr_in6);
-    else 
-#endif 
+    else
+#endif
       ss_size = sizeof(struct sockaddr_in);
- 
+
     /* allocate memory to told the struct, the address and the name */
     ai = calloc(1, sizeof(struct Curl_addrinfo) + ss_size + namelen);
     if(!ai) {
-      result = CURLE_OUT_OF_MEMORY; 
-      break; 
-    } 
+      result = CURLE_OUT_OF_MEMORY;
+      break;
+    }
     /* put the address after the struct */
     ai->ai_addr = (void *)((char *)ai + sizeof(struct Curl_addrinfo));
     /* then put the name after the address */
     ai->ai_canonname = (char *)ai->ai_addr + ss_size;
     memcpy(ai->ai_canonname, he->h_name, namelen);
- 
-    if(!firstai) 
-      /* store the pointer we want to return from this function */ 
-      firstai = ai; 
- 
-    if(prevai) 
-      /* make the previous entry point to this */ 
-      prevai->ai_next = ai; 
- 
-    ai->ai_family = he->h_addrtype; 
- 
-    /* we return all names as STREAM, so when using this address for TFTP 
-       the type must be ignored and conn->socktype be used instead! */ 
-    ai->ai_socktype = SOCK_STREAM; 
- 
-    ai->ai_addrlen = (curl_socklen_t)ss_size; 
- 
-    /* leave the rest of the struct filled with zero */ 
- 
+
+    if(!firstai)
+      /* store the pointer we want to return from this function */
+      firstai = ai;
+
+    if(prevai)
+      /* make the previous entry point to this */
+      prevai->ai_next = ai;
+
+    ai->ai_family = he->h_addrtype;
+
+    /* we return all names as STREAM, so when using this address for TFTP
+       the type must be ignored and conn->socktype be used instead! */
+    ai->ai_socktype = SOCK_STREAM;
+
+    ai->ai_addrlen = (curl_socklen_t)ss_size;
+
+    /* leave the rest of the struct filled with zero */
+
     switch(ai->ai_family) {
-    case AF_INET: 
-      addr = (void *)ai->ai_addr; /* storage area for this info */ 
- 
-      memcpy(&addr->sin_addr, curr, sizeof(struct in_addr)); 
+    case AF_INET:
+      addr = (void *)ai->ai_addr; /* storage area for this info */
+
+      memcpy(&addr->sin_addr, curr, sizeof(struct in_addr));
       addr->sin_family = (CURL_SA_FAMILY_T)(he->h_addrtype);
-      addr->sin_port = htons((unsigned short)port); 
-      break; 
- 
-#ifdef ENABLE_IPV6 
-    case AF_INET6: 
-      addr6 = (void *)ai->ai_addr; /* storage area for this info */ 
- 
-      memcpy(&addr6->sin6_addr, curr, sizeof(struct in6_addr)); 
+      addr->sin_port = htons((unsigned short)port);
+      break;
+
+#ifdef ENABLE_IPV6
+    case AF_INET6:
+      addr6 = (void *)ai->ai_addr; /* storage area for this info */
+
+      memcpy(&addr6->sin6_addr, curr, sizeof(struct in6_addr));
       addr6->sin6_family = (CURL_SA_FAMILY_T)(he->h_addrtype);
-      addr6->sin6_port = htons((unsigned short)port); 
-      break; 
-#endif 
-    } 
- 
-    prevai = ai; 
-  } 
- 
+      addr6->sin6_port = htons((unsigned short)port);
+      break;
+#endif
+    }
+
+    prevai = ai;
+  }
+
   if(result) {
-    Curl_freeaddrinfo(firstai); 
-    firstai = NULL; 
-  } 
- 
-  return firstai; 
-} 
- 
- 
-struct namebuff { 
-  struct hostent hostentry; 
-  union { 
-    struct in_addr  ina4; 
-#ifdef ENABLE_IPV6 
-    struct in6_addr ina6; 
-#endif 
-  } addrentry; 
-  char *h_addr_list[2]; 
-}; 
- 
- 
-/* 
- * Curl_ip2addr() 
- * 
- * This function takes an internet address, in binary form, as input parameter 
- * along with its address family and the string version of the address, and it 
- * returns a Curl_addrinfo chain filled in correctly with information for the 
- * given address/host 
- */ 
- 
+    Curl_freeaddrinfo(firstai);
+    firstai = NULL;
+  }
+
+  return firstai;
+}
+
+
+struct namebuff {
+  struct hostent hostentry;
+  union {
+    struct in_addr  ina4;
+#ifdef ENABLE_IPV6
+    struct in6_addr ina6;
+#endif
+  } addrentry;
+  char *h_addr_list[2];
+};
+
+
+/*
+ * Curl_ip2addr()
+ *
+ * This function takes an internet address, in binary form, as input parameter
+ * along with its address family and the string version of the address, and it
+ * returns a Curl_addrinfo chain filled in correctly with information for the
+ * given address/host
+ */
+
 struct Curl_addrinfo *
-Curl_ip2addr(int af, const void *inaddr, const char *hostname, int port) 
-{ 
+Curl_ip2addr(int af, const void *inaddr, const char *hostname, int port)
+{
   struct Curl_addrinfo *ai;
- 
-#if defined(__VMS) && \ 
-    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64) 
-#pragma pointer_size save 
-#pragma pointer_size short 
-#pragma message disable PTRMISMATCH 
-#endif 
- 
-  struct hostent  *h; 
-  struct namebuff *buf; 
-  char  *addrentry; 
-  char  *hoststr; 
-  size_t addrsize; 
- 
-  DEBUGASSERT(inaddr && hostname); 
- 
-  buf = malloc(sizeof(struct namebuff)); 
-  if(!buf) 
-    return NULL; 
- 
-  hoststr = strdup(hostname); 
-  if(!hoststr) { 
-    free(buf); 
-    return NULL; 
-  } 
- 
-  switch(af) { 
-  case AF_INET: 
-    addrsize = sizeof(struct in_addr); 
-    addrentry = (void *)&buf->addrentry.ina4; 
-    memcpy(addrentry, inaddr, sizeof(struct in_addr)); 
-    break; 
-#ifdef ENABLE_IPV6 
-  case AF_INET6: 
-    addrsize = sizeof(struct in6_addr); 
-    addrentry = (void *)&buf->addrentry.ina6; 
-    memcpy(addrentry, inaddr, sizeof(struct in6_addr)); 
-    break; 
-#endif 
-  default: 
-    free(hoststr); 
-    free(buf); 
-    return NULL; 
-  } 
- 
-  h = &buf->hostentry; 
-  h->h_name = hoststr; 
-  h->h_aliases = NULL; 
-  h->h_addrtype = (short)af; 
-  h->h_length = (short)addrsize; 
-  h->h_addr_list = &buf->h_addr_list[0]; 
-  h->h_addr_list[0] = addrentry; 
-  h->h_addr_list[1] = NULL; /* terminate list of entries */ 
- 
-#if defined(__VMS) && \ 
-    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64) 
-#pragma pointer_size restore 
-#pragma message enable PTRMISMATCH 
-#endif 
- 
-  ai = Curl_he2ai(h, port); 
- 
-  free(hoststr); 
-  free(buf); 
- 
-  return ai; 
-} 
- 
-/* 
- * Given an IPv4 or IPv6 dotted string address, this converts it to a proper 
- * allocated Curl_addrinfo struct and returns it. 
- */ 
+
+#if defined(__VMS) && \
+    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)
+#pragma pointer_size save
+#pragma pointer_size short
+#pragma message disable PTRMISMATCH
+#endif
+
+  struct hostent  *h;
+  struct namebuff *buf;
+  char  *addrentry;
+  char  *hoststr;
+  size_t addrsize;
+
+  DEBUGASSERT(inaddr && hostname);
+
+  buf = malloc(sizeof(struct namebuff));
+  if(!buf)
+    return NULL;
+
+  hoststr = strdup(hostname);
+  if(!hoststr) {
+    free(buf);
+    return NULL;
+  }
+
+  switch(af) {
+  case AF_INET:
+    addrsize = sizeof(struct in_addr);
+    addrentry = (void *)&buf->addrentry.ina4;
+    memcpy(addrentry, inaddr, sizeof(struct in_addr));
+    break;
+#ifdef ENABLE_IPV6
+  case AF_INET6:
+    addrsize = sizeof(struct in6_addr);
+    addrentry = (void *)&buf->addrentry.ina6;
+    memcpy(addrentry, inaddr, sizeof(struct in6_addr));
+    break;
+#endif
+  default:
+    free(hoststr);
+    free(buf);
+    return NULL;
+  }
+
+  h = &buf->hostentry;
+  h->h_name = hoststr;
+  h->h_aliases = NULL;
+  h->h_addrtype = (short)af;
+  h->h_length = (short)addrsize;
+  h->h_addr_list = &buf->h_addr_list[0];
+  h->h_addr_list[0] = addrentry;
+  h->h_addr_list[1] = NULL; /* terminate list of entries */
+
+#if defined(__VMS) && \
+    defined(__INITIAL_POINTER_SIZE) && (__INITIAL_POINTER_SIZE == 64)
+#pragma pointer_size restore
+#pragma message enable PTRMISMATCH
+#endif
+
+  ai = Curl_he2ai(h, port);
+
+  free(hoststr);
+  free(buf);
+
+  return ai;
+}
+
+/*
+ * Given an IPv4 or IPv6 dotted string address, this converts it to a proper
+ * allocated Curl_addrinfo struct and returns it.
+ */
 struct Curl_addrinfo *Curl_str2addr(char *address, int port)
-{ 
-  struct in_addr in; 
-  if(Curl_inet_pton(AF_INET, address, &in) > 0) 
-    /* This is a dotted IP address 123.123.123.123-style */ 
-    return Curl_ip2addr(AF_INET, &in, address, port); 
-#ifdef ENABLE_IPV6 
+{
+  struct in_addr in;
+  if(Curl_inet_pton(AF_INET, address, &in) > 0)
+    /* This is a dotted IP address 123.123.123.123-style */
+    return Curl_ip2addr(AF_INET, &in, address, port);
+#ifdef ENABLE_IPV6
   {
-    struct in6_addr in6; 
-    if(Curl_inet_pton(AF_INET6, address, &in6) > 0) 
-      /* This is a dotted IPv6 address ::1-style */ 
-      return Curl_ip2addr(AF_INET6, &in6, address, port); 
-  } 
-#endif 
-  return NULL; /* bad input format */ 
-} 
- 
+    struct in6_addr in6;
+    if(Curl_inet_pton(AF_INET6, address, &in6) > 0)
+      /* This is a dotted IPv6 address ::1-style */
+      return Curl_ip2addr(AF_INET6, &in6, address, port);
+  }
+#endif
+  return NULL; /* bad input format */
+}
+
 #ifdef USE_UNIX_SOCKETS
 /**
  * Given a path to a Unix domain socket, return a newly allocated Curl_addrinfo
@@ -509,61 +509,61 @@ struct Curl_addrinfo *Curl_unix2addr(const char *path, bool *longpath,
 
 #if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) &&  \
   defined(HAVE_FREEADDRINFO)
-/* 
+/*
  * curl_dbg_freeaddrinfo()
- * 
- * This is strictly for memory tracing and are using the same style as the 
- * family otherwise present in memdebug.c. I put these ones here since they 
- * require a bunch of structs I didn't want to include in memdebug.c 
- */ 
- 
-void 
+ *
+ * This is strictly for memory tracing and are using the same style as the
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
+ */
+
+void
 curl_dbg_freeaddrinfo(struct addrinfo *freethis,
                       int line, const char *source)
-{ 
+{
   curl_dbg_log("ADDR %s:%d freeaddrinfo(%p)\n",
                source, line, (void *)freethis);
 #ifdef USE_LWIPSOCK
   lwip_freeaddrinfo(freethis);
 #else
-  (freeaddrinfo)(freethis); 
+  (freeaddrinfo)(freethis);
 #endif
-} 
-#endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */ 
- 
- 
-#if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) 
-/* 
+}
+#endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */
+
+
+#if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO)
+/*
  * curl_dbg_getaddrinfo()
- * 
- * This is strictly for memory tracing and are using the same style as the 
- * family otherwise present in memdebug.c. I put these ones here since they 
- * require a bunch of structs I didn't want to include in memdebug.c 
- */ 
- 
-int 
+ *
+ * This is strictly for memory tracing and are using the same style as the
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
+ */
+
+int
 curl_dbg_getaddrinfo(const char *hostname,
                     const char *service,
                     const struct addrinfo *hints,
                     struct addrinfo **result,
                     int line, const char *source)
-{ 
+{
 #ifdef USE_LWIPSOCK
   int res = lwip_getaddrinfo(hostname, service, hints, result);
 #else
   int res = (getaddrinfo)(hostname, service, hints, result);
 #endif
-  if(0 == res) 
-    /* success */ 
+  if(0 == res)
+    /* success */
     curl_dbg_log("ADDR %s:%d getaddrinfo() = %p\n",
                  source, line, (void *)*result);
-  else 
+  else
     curl_dbg_log("ADDR %s:%d getaddrinfo() failed\n",
                  source, line);
-  return res; 
-} 
-#endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */ 
- 
+  return res;
+}
+#endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */
+
 #if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS)
 /*
  * Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and Mac OS X