X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fstrlcpy.c;h=ffa0b0b01458041a91f50d0d2c09f7ff2a8e828d;hb=f9895817321790bef33a56e3b10f3f71d989c23e;hp=bbebf1db5ec6d27ea092af4be4bfedb933275641;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/string/strlcpy.c b/src/string/strlcpy.c
index bbebf1db..ffa0b0b0 100644
--- a/src/string/strlcpy.c
+++ b/src/string/strlcpy.c
@@ -1,8 +1,7 @@
+#define _BSD_SOURCE
 #include <string.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>
-#include "libc.h"
 
 #define ALIGN (sizeof(size_t)-1)
 #define ONES ((size_t)-1/UCHAR_MAX)
@@ -13,18 +12,21 @@ size_t strlcpy(char *d, const char *s, size_t n)
 {
 	char *d0 = d;
 	size_t *wd;
-	const size_t *ws;
 
 	if (!n--) goto finish;
-	if (((uintptr_t)s & ALIGN) != ((uintptr_t)d & ALIGN)) {
+#ifdef __GNUC__
+	typedef size_t __attribute__((__may_alias__)) word;
+	const word *ws;
+	if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
 		for (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
 		if (n && *s) {
 			wd=(void *)d; ws=(const void *)s;
 			for (; n>=sizeof(size_t) && !HASZERO(*ws);
-			       n-=sizeof(size_t), ws++, *wd++) *wd = *ws;
+			       n-=sizeof(size_t), ws++, wd++) *wd = *ws;
 			d=(void *)wd; s=(const void *)ws;
 		}
 	}
+#endif
 	for (; n && (*d=*s); n--, s++, d++);
 	*d = 0;
 finish: