mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-31 22:10:34 +03:00
50f81fd74b
* sysdeps/generic/memcopy.h (reg_char): Delete. * debug/strcat_chk.c: Use char, not reg_char. * debug/strcpy_chk.c: Likewise. * debug/strncat_chk.c: Likewise. * debug/strncpy_chk.c: Likewise. * string/memchr.c: Likewise. * string/memrchr.c: Likewise. * string/rawmemchr.c: Likewise. * string/strcat.c: Likewise. * string/strchr.c: Likewise. * string/strchrnul.c: Likewise. * string/strcmp.c: Likewise. * string/strcpy.c: Likewise. * string/strncat.c: Likewise. * string/strncmp.c: Likewise. * string/strncpy.c: Likewise.
100 lines
2.1 KiB
C
100 lines
2.1 KiB
C
/* Copyright (C) 1991, 1997, 2004 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
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/>. */
|
|
|
|
#include <string.h>
|
|
|
|
#include <memcopy.h>
|
|
|
|
|
|
char *
|
|
__strncat_chk (s1, s2, n, s1len)
|
|
char *s1;
|
|
const char *s2;
|
|
size_t n;
|
|
size_t s1len;
|
|
{
|
|
char c;
|
|
char *s = s1;
|
|
|
|
/* Find the end of S1. */
|
|
do
|
|
{
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s1++;
|
|
}
|
|
while (c != '\0');
|
|
|
|
/* Make S1 point before next character, so we can increment
|
|
it while memory is read (wins on pipelined cpus). */
|
|
++s1len;
|
|
s1 -= 2;
|
|
|
|
if (n >= 4)
|
|
{
|
|
size_t n4 = n >> 2;
|
|
do
|
|
{
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s2++;
|
|
*++s1 = c;
|
|
if (c == '\0')
|
|
return s;
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s2++;
|
|
*++s1 = c;
|
|
if (c == '\0')
|
|
return s;
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s2++;
|
|
*++s1 = c;
|
|
if (c == '\0')
|
|
return s;
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s2++;
|
|
*++s1 = c;
|
|
if (c == '\0')
|
|
return s;
|
|
} while (--n4 > 0);
|
|
n &= 3;
|
|
}
|
|
|
|
while (n > 0)
|
|
{
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *s2++;
|
|
*++s1 = c;
|
|
if (c == '\0')
|
|
return s;
|
|
n--;
|
|
}
|
|
|
|
if (c != '\0')
|
|
{
|
|
if (__builtin_expect (s1len-- == 0, 0))
|
|
__chk_fail ();
|
|
*++s1 = '\0';
|
|
}
|
|
|
|
return s;
|
|
}
|