X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstring%2Fstpncpy.c;h=0a2c2a9d716e1a9f0591d56e6e35a7c0a0fbe0ef;hp=a877f5fe5e8d96d40adcade997dcde76807fd84d;hb=4853c1f7f7b5023aa6a409abc1e759f5f92c9c4e;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/string/stpncpy.c b/src/string/stpncpy.c
index a877f5fe..0a2c2a9d 100644
--- a/src/string/stpncpy.c
+++ b/src/string/stpncpy.c
@@ -9,17 +9,17 @@
 #define HIGHS (ONES * (UCHAR_MAX/2+1))
 #define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
 
-char *__stpncpy(char *d, const char *s, size_t n)
+char *__stpncpy(char *restrict d, const char *restrict s, size_t n)
 {
 	size_t *wd;
 	const size_t *ws;
 
-	if (((uintptr_t)s & ALIGN) != ((uintptr_t)d & ALIGN)) {
+	if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
 		for (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
 		if (!n || !*s) goto tail;
 		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;
 	}
 	for (; n && (*d=*s); n--, s++, d++);