X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8f694072a524ab0f7edc4c3402fb5fc41ecbfa5e..204f4f4d091890d9106e744cffb9561e82df44ad:/lib/inet_ntop.c

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 9451d23d..15e3ebd3 100644
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -15,18 +15,8 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] =
-	"$Id$";
-#endif /* LIBC_SCCS and not lint */
 
-#include <config.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/net.h>
+#include "rsync.h"
 
 #define NS_INT16SZ	 2
 #define NS_IN6ADDRSZ	16
@@ -53,7 +43,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst,
  *	Paul Vixie, 1996.
  */
 const char *
-isc_net_ntop(int af, const void *src, char *dst, size_t size)
+inet_ntop(int af, const void *src, char *dst, size_t size)
 {
 	switch (af) {
 	case AF_INET:
@@ -91,7 +81,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size)
 		errno = ENOSPC;
 		return (NULL);
 	}
-	strcpy(dst, tmp);
+	memcpy(dst, tmp, len + 1);
 
 	return (dst);
 }
@@ -188,7 +178,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
 		errno = ENOSPC;
 		return (NULL);
 	}
-	strcpy(dst, tmp);
+	memcpy(dst, tmp, tp - tmp);
 	return (dst);
 }
 #endif /* AF_INET6 */