8215c9ecf2
* include/bits/wchar2.h: New file. * wcsmbs/wchar.h: Include <bits/wchar2.h> if fortification is requested. * wcsmbs/wcsncpy.c: Add __wcsncpy alias. * string/bits/string3.h: Add fortified stpncpy definitions. * sysdeps/generic/stpncpy_chk.c: New file. * libio/vswprintf.c: Move _IO_wstrnfile definition to strfile.h. Export _IO_wstrn_jumps. * libio/strfile.h: Define _IO_wstrnfile and declare _IO_wstrn_jumps. * include/wchar.h: Declare __wcsncpy and __vswprintf_chk. * debug/fgetws_chk.c: New file. * debug/fgetws_u_chk.c: New file. * debug/fwprintf_chk.c: New file. * debug/swprintf_chk.c: New file. * debug/vfwprintf_chk.c: New file. * debug/vswprintf_chk.c: New file. * debug/vwprintf_chk.c: New file. * debug/wcpcpy_chk.c: New file. * debug/wcpncpy_chk.c: New file. * debug/wcscat_chk.c: New file. * debug/wcscpy_chk.c: New file. * debug/wcsncat_chk.c: New file. * debug/wcsncpy_chk.c: New file. * debug/wmemcpy_chk.c: New file. * debug/wmemmove_chk.c: New file. * debug/wmempcpy_chk.c: New file. * debug/wmemset_chk.c: New file. * debug/wprintf_chk.c: New file. * debug/tst-chk1.c: Add tests for new functions. * debug/Versions: Export new functions. * debug/Makefile (routines): Add new functions.
97 lines
2.3 KiB
C
97 lines
2.3 KiB
C
/* Copyright (C) 1995, 1996, 1997, 2005 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
|
|
|
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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <wchar.h>
|
|
|
|
|
|
/* Append no more than N wide-character of SRC onto DEST. */
|
|
wchar_t *
|
|
__wcsncat_chk (wchar_t *dest, const wchar_t *src, size_t n, size_t destlen)
|
|
{
|
|
wchar_t c;
|
|
wchar_t * const s = dest;
|
|
|
|
/* Find the end of DEST. */
|
|
do
|
|
{
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *dest++;
|
|
}
|
|
while (c != L'\0');
|
|
|
|
/* Make DEST point before next character, so we can increment
|
|
it while memory is read (wins on pipelined cpus). */
|
|
++destlen;
|
|
dest -= 2;
|
|
|
|
if (n >= 4)
|
|
{
|
|
size_t n4 = n >> 2;
|
|
do
|
|
{
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *src++;
|
|
*++dest = c;
|
|
if (c == L'\0')
|
|
return s;
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *src++;
|
|
*++dest = c;
|
|
if (c == L'\0')
|
|
return s;
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *src++;
|
|
*++dest = c;
|
|
if (c == L'\0')
|
|
return s;
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *src++;
|
|
*++dest = c;
|
|
if (c == L'\0')
|
|
return s;
|
|
} while (--n4 > 0);
|
|
n &= 3;
|
|
}
|
|
|
|
while (n > 0)
|
|
{
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
c = *src++;
|
|
*++dest = c;
|
|
if (c == L'\0')
|
|
return s;
|
|
n--;
|
|
}
|
|
|
|
if (c != L'\0')
|
|
{
|
|
if (__builtin_expect (destlen-- == 0, 0))
|
|
__chk_fail ();
|
|
*++dest = L'\0';
|
|
}
|
|
|
|
return s;
|
|
}
|