* debug/mbstowcs_chk.c: New file.

	* debug/wcstombs_chk.c: New file.
	* debug/Makefile (routines): Add mbstowcs_chk and wcstombs_chk.
	* debug/Versions: Add __mbstowcs_chk and __wcstombs_chk.
	* stdlib/bits/stdlib.h: Add definitions for mbstowcs and wcstombs.

	* wcsmbs/bits/wchar2.h (mbsrtowcs): Pretty printing.

	* string/test-memset.c (test_main): Use negative byte value in

diff --git a/ChangeLog b/ChangeLog
index 34697d2..0b8f1fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2005-07-25  Ulrich Drepper  <drepper@redhat.com>
+
+       * debug/mbstowcs_chk.c: New file.
+       * debug/wcstombs_chk.c: New file.
+       * debug/Makefile (routines): Add mbstowcs_chk and wcstombs_chk.
+       * debug/Versions: Add __mbstowcs_chk and __wcstombs_chk.
+       * stdlib/bits/stdlib.h: Add definitions for mbstowcs and wcstombs.
+
+       * wcsmbs/bits/wchar2.h (mbsrtowcs): Pretty printing.
+
 2005-07-24  Ulrich Drepper  <drepper@redhat.com>
 
-       * string/test-memset.c (test_main): Use negative byte value is
+       * string/test-memset.c (test_main): Use negative byte value in
        test.
 
        * string/test-memset.c (do_one_test): Compare effect of call, not

diff --git a/debug/Makefile b/debug/Makefile
index 009c05c..9123bf6 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -39,7 +39,8 @@ routines  = backtrace backtracesyms backtracesymsfd noophooks \
            vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
            confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \
            gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
-           wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk \
+           wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
+           wcstombs_chk \
            stack_chk_fail \
            $(static-only-routines)
 static-only-routines := warning-nop stack_chk_fail_local

diff --git a/debug/Versions b/debug/Versions
index 2f4183b..683eb17 100644 (file)
--- a/debug/Versions
+++ b/debug/Versions
@@ -31,7 +31,8 @@ libc {
     __vwprintf_chk; __vfwprintf_chk; __fgetws_chk; __fgetws_unlocked_chk;
     __confstr_chk; __getgroups_chk; __ttyname_r_chk; __getlogin_r_chk;
     __gethostname_chk; __getdomainname_chk; __wcrtomb_chk; __mbsnrtowcs_chk;
-    __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk;
+    __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; __mbstowcs_chk;
+    __wcstombs_chk;
 
     __stack_chk_fail;
   }

diff --git a/debug/mbstowcs_chk.c b/debug/mbstowcs_chk.c
new file mode 100644 (file)
index 0000000..2c1c3bb
--- /dev/null
+++ b/debug/mbstowcs_chk.c
@@ -0,0 +1,35 @@
+/* Copyright (C) 2005 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <locale.h>
+#include <string.h>
+#include <wchar.h>
+
+
+size_t
+__mbstowcs_chk (wchar_t *dst, const char **src, size_t len, size_t dstlen)
+{
+  if (__builtin_expect (dstlen < len * sizeof (wchar_t), 0))
+    __chk_fail ();
+
+  mbstate_t state;
+
+  memset (&state, '\0', sizeof state);
+  /* Return how many we wrote (or maybe an error).  */
+  return __mbsrtowcs (dst, src, len, &state);
+}

diff --git a/debug/wcstombs_chk.c b/debug/wcstombs_chk.c
new file mode 100644 (file)
index 0000000..f5f51a0
--- /dev/null
+++ b/debug/wcstombs_chk.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2005 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <locale.h>
+#include <string.h>
+#include <wchar.h>
+
+
+size_t
+__wcstombs_chk (char *dst, __const wchar_t *src, size_t len, size_t dstlen)
+{
+  if (__builtin_expect (dstlen < len, 0))
+    __chk_fail ();
+
+  mbstate_t state;
+
+  memset (&state, '\0', sizeof state);
+
+  /* Return how many we wrote (or maybe an error).  */
+  return __wcsrtombs (dst, src, len, &state);
+}

diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h
index 7ca6c86..9ff8f62 100644 (file)
--- a/stdlib/bits/stdlib.h
+++ b/stdlib/bits/stdlib.h
@@ -73,3 +73,42 @@ wctomb (char *__s, wchar_t __wchar)
     return __wctomb_chk (__s, __wchar, __bos (__s));
   return __wctomb_alias (__s, __wchar);
 }
+
+
+extern size_t __mbstowcs_chk (wchar_t *__restrict __dst,
+                             __const char *__restrict __src,
+                             size_t __len, size_t __dstlen) __THROW;
+extern size_t __REDIRECT_NTH (__mbstowcs_alias,
+                             (wchar_t *__restrict __dst,
+                              __const char *__restrict __src,
+                              size_t __len), mbstowcs);
+
+extern __always_inline size_t
+mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src,
+         size_t __len)
+{
+  if (__bos (__dst) != (size_t) -1
+      && (!__builtin_constant_p (__len)
+         || __len * sizeof (wchar_t) > __bos (__dst)))
+    return __mbstowcs_chk (__dst, __src, __len, __bos (__dst));
+  return __mbstowcs_alias (__dst, __src, __len);
+}
+
+
+extern size_t __wcstombs_chk (char *__restrict __dst,
+                             __const wchar_t *__restrict __src,
+                             size_t __len, size_t __dstlen) __THROW;
+extern size_t __REDIRECT_NTH (__wcstombs_alias,
+                             (char *__restrict __dst,
+                              __const wchar_t *__restrict __src,
+                              size_t __len), wcstombs);
+
+extern __always_inline size_t
+wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src,
+         size_t __len)
+{
+  if (__bos (__dst) != (size_t) -1
+      && (!__builtin_constant_p (__len) || __len > __bos (__dst)))
+    return __wcstombs_chk (__dst, __src, __len, __bos (__dst));
+  return __wcstombs_alias (__dst, __src, __len);
+}

diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h
index 5e6396f..ec61aac 100644 (file)
--- a/wcsmbs/bits/wchar2.h
+++ b/wcsmbs/bits/wchar2.h
@@ -320,7 +320,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowcs_alias,
 
 extern __always_inline size_t
 mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src,
-           size_t __len, mbstate_t *__restrict __ps)
+          size_t __len, mbstate_t *__restrict __ps)
 {
   if (__bos (__dst) != (size_t) -1
       && (!__builtin_constant_p (__len)