Fixed ftp support with uClibc due to differing inet_ntoa_r() behaviour.

[platform/upstream/curl.git] / lib / inet_ntop.c

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 6b15c02..293723a 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -56,8 +56,19 @@
  */
 static const char *inet_ntop4 (const u_char *src, char *dst, size_t size)
 {
-#ifdef HAVE_INET_NTOA_R
+#if defined(HAVE_INET_NTOA_R_2_ARGS)
+  const char *ptr;
+  size_t len;
+  curlassert(size >= 16);
+  ptr = inet_ntoa_r(*(struct in_addr*)src, dst);
+  len = strlen(ptr);
+  memmove(dst, ptr, len);
+  dst[len] = 0;
+  return dst;
+
+#elif defined(HAVE_INET_NTOA_R)
   return inet_ntoa_r(*(struct in_addr*)src, dst, size);
+
 #else
   const char *addr = inet_ntoa(*(struct in_addr*)src);