summary refs log tree commit diff
path: root/wcsmbs
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wcpncpy.c57
1 files changed, 5 insertions, 52 deletions
diff --git a/wcsmbs/wcpncpy.c b/wcsmbs/wcpncpy.c
index 7568f3b11c..74f22c277c 100644
--- a/wcsmbs/wcpncpy.c
+++ b/wcsmbs/wcpncpy.c
@@ -27,59 +27,12 @@
 wchar_t *
 __wcpncpy (wchar_t *dest, const wchar_t *src, size_t n)
 {
-  wint_t c;
-  wchar_t *const s = dest;
-
-  if (n >= 4)
-    {
-      size_t n4 = n >> 2;
-
-      for (;;)
-	{
-	  c = *src++;
-	  *dest++ = c;
-	  if (c == L'\0')
-	    break;
-	  c = *src++;
-	  *dest++ = c;
-	  if (c == L'\0')
-	    break;
-	  c = *src++;
-	  *dest++ = c;
-	  if (c == L'\0')
-	    break;
-	  c = *src++;
-	  *dest++ = c;
-	  if (c == L'\0')
-	    break;
-	  if (--n4 == 0)
-	    goto last_chars;
-	}
-      n -= dest - s;
-      goto zero_fill;
-    }
-
- last_chars:
-  n &= 3;
-  if (n == 0)
+  size_t size = __wcsnlen (src, n);
+  __wmemcpy (dest, src, size);
+  dest += size;
+  if (size == n)
     return dest;
-
-  for (;;)
-    {
-      c = *src++;
-      --n;
-      *dest++ = c;
-      if (c == L'\0')
-	break;
-      if (n == 0)
-	return dest;
-    }
-
- zero_fill:
-  while (n-- > 0)
-    dest[n] = L'\0';
-
-  return dest - 1;
+  return wmemset (dest, L'\0', (n - size));
 }
 
 #ifndef WCPNCPY