socket: Use may_alias on sockaddr structs (bug 19622)

[thirdparty/glibc.git] / string / strncat.c

diff --git a/string/strncat.c b/string/strncat.c
index 7ac44561bdfa8a82267a9fea73c0cd7d6e2a12df..4600f012b0b31be3e1f8cb8f8e569838968e5354 100644 (file)
--- a/string/strncat.c
+++ b/string/strncat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,70 +13,32 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 
-#ifdef _LIBC
-# include <memcopy.h>
-#endif
-
 #ifndef STRNCAT
 # undef strncat
 # define STRNCAT  strncat
+# define STRNCAT_PRIMARY
 #endif
 
 char *
 STRNCAT (char *s1, const char *s2, size_t n)
 {
-  char c;
   char *s = s1;
 
   /* Find the end of S1.  */
-  do
-    c = *s1++;
-  while (c != '\0');
-
-  /* Make S1 point before next character, so we can increment
-     it while memory is read (wins on pipelined cpus).  */
-  s1 -= 2;
+  s1 += strlen (s1);
 
-  if (n >= 4)
-    {
-      size_t n4 = n >> 2;
-      do
-       {
-         c = *s2++;
-         *++s1 = c;
-         if (c == '\0')
-           return s;
-         c = *s2++;
-         *++s1 = c;
-         if (c == '\0')
-           return s;
-         c = *s2++;
-         *++s1 = c;
-         if (c == '\0')
-           return s;
-         c = *s2++;
-         *++s1 = c;
-         if (c == '\0')
-           return s;
-       } while (--n4 > 0);
-      n &= 3;
-    }
+  size_t ss = __strnlen (s2, n);
 
-  while (n > 0)
-    {
-      c = *s2++;
-      *++s1 = c;
-      if (c == '\0')
-       return s;
-      n--;
-    }
-
-  if (c != '\0')
-    *++s1 = '\0';
+  s1[ss] = '\0';
+  memcpy (s1, s2, ss);
 
   return s;
 }
+#ifdef STRNCAT_PRIMARY
+strong_alias (STRNCAT, __strncat)
+libc_hidden_def (__strncat)
+#endif