From 9372c9582451c4d40152769a0aeba35e58942b59 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 9 Nov 2002 00:36:21 +0000 Subject: [PATCH] * string/test-strspn.c (do_test): Ensure zero termination. * string/test-strpbrk.c (do_test): Likewise. * string/test-strncmp.c (stupid_strncmp): Use strnlen, not strlen. * string/test-strncpy.c (stupid_strncpy): Likewise. * string/test-stpncpy.c (stupid_stpncpy): Likewise. 2002-10-08 Roland McGrath * string/test-string.h (test_init): Fill BUF1 and BUF2 with nonzero characters. 2002-09-22 H.J. Lu * sysdeps/unix/sysv/linux/mmap64.c (MMAP2_PAGE_SHIFT): Renamed from PAGE_SHIFT. Define if not defined. Check MMAP2_PAGE_SHIFT only if __NR_mmap2 is defined. * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Moved to ... * sysdeps/unix/sysv/linux/mmap64.c: ... here. * sysdeps/unix/sysv/linux/hppa/mmap64.c: File removed. * sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c: FIle removed, --- ChangeLog | 24 +++++++ string/test-stpncpy.c | 4 +- string/test-string.h | 3 + string/test-strncmp.c | 2 +- string/test-strncpy.c | 4 +- string/test-strpbrk.c | 8 ++- string/test-strspn.c | 8 ++- sysdeps/unix/sysv/linux/hppa/mmap64.c | 1 - sysdeps/unix/sysv/linux/mmap64.c | 70 ++++++++++++++++---- sysdeps/unix/sysv/linux/powerpc/mmap64.c | 89 -------------------------- sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c | 80 ----------------------- 11 files changed, 104 insertions(+), 189 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/hppa/mmap64.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/mmap64.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c diff --git a/ChangeLog b/ChangeLog index 9b36a1f..13e22f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2002-10-09 Jakub Jelinek + + * string/test-strspn.c (do_test): Ensure zero termination. + * string/test-strpbrk.c (do_test): Likewise. + * string/test-strncmp.c (stupid_strncmp): Use strnlen, not strlen. + * string/test-strncpy.c (stupid_strncpy): Likewise. + * string/test-stpncpy.c (stupid_stpncpy): Likewise. + +2002-10-08 Roland McGrath + + * string/test-string.h (test_init): Fill BUF1 and BUF2 with + nonzero characters. + +2002-09-22 H.J. Lu + + * sysdeps/unix/sysv/linux/mmap64.c (MMAP2_PAGE_SHIFT): Renamed + from PAGE_SHIFT. Define if not defined. Check MMAP2_PAGE_SHIFT + only if __NR_mmap2 is defined. + + * sysdeps/unix/sysv/linux/powerpc/mmap64.c: Moved to ... + * sysdeps/unix/sysv/linux/mmap64.c: ... here. + * sysdeps/unix/sysv/linux/hppa/mmap64.c: File removed. + * sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c: FIle removed, + 2002-11-08 Jakub Jelinek * posix/bug-regex13.c (tests): Add new test. diff --git a/string/test-stpncpy.c b/string/test-stpncpy.c index 5bcb1dd..8784588 100644 --- a/string/test-stpncpy.c +++ b/string/test-stpncpy.c @@ -47,8 +47,8 @@ simple_stpncpy (char *dst, const char *src, size_t n) char * stupid_stpncpy (char *dst, const char *src, size_t n) { - size_t ns = strlen (src); - size_t i, nc = n < ns ? n : ns; + size_t nc = strnlen (src, n); + size_t i; for (i = 0; i < nc; ++i) dst[i] = src[i]; diff --git a/string/test-string.h b/string/test-string.h index ae7fc34..c131f19 100644 --- a/string/test-string.h +++ b/string/test-string.h @@ -143,6 +143,9 @@ test_init (void) printf ("Setting seed to 0x%x\n", seed); srandom (seed); } + + memset (buf1, 0xa5, page_size); + memset (buf2, 0x5a, page_size); } #endif diff --git a/string/test-strncmp.c b/string/test-strncmp.c index 8881909..2c49e57 100644 --- a/string/test-strncmp.c +++ b/string/test-strncmp.c @@ -42,7 +42,7 @@ simple_strncmp (const char *s1, const char *s2, size_t n) int stupid_strncmp (const char *s1, const char *s2, size_t n) { - size_t ns1 = strlen (s1) + 1, ns2 = strlen (s2) + 1; + size_t ns1 = strnlen (s1, n) + 1, ns2 = strnlen (s2, n) + 1; int ret = 0; n = ns1 < n ? ns1 : n; diff --git a/string/test-strncpy.c b/string/test-strncpy.c index 11ff30e..7820b61 100644 --- a/string/test-strncpy.c +++ b/string/test-strncpy.c @@ -47,8 +47,8 @@ simple_strncpy (char *dst, const char *src, size_t n) char * stupid_strncpy (char *dst, const char *src, size_t n) { - size_t ns = strlen (src); - size_t i, nc = n < ns ? n : ns; + size_t nc = strnlen (src, n); + size_t i; for (i = 0; i < nc; ++i) dst[i] = src[i]; diff --git a/string/test-strpbrk.c b/string/test-strpbrk.c index 77cf56d..a920c00 100644 --- a/string/test-strpbrk.c +++ b/string/test-strpbrk.c @@ -97,7 +97,7 @@ do_test (size_t align, size_t pos, size_t len) char *rej, *s; align &= 7; - if (align + pos >= page_size || len > 240) + if (align + pos + 10 >= page_size || len > 240) return; rej = buf2 + (random () & 255); @@ -127,6 +127,12 @@ do_test (size_t align, size_t pos, size_t len) } } s[pos] = rej[random () % (len + 1)]; + if (s[pos]) + { + for (i = pos + 1; i < pos + 10; ++i) + s[i] = random () & 255; + s[i] = '\0'; + } result = STRPBRK_RESULT (s, pos); if (HP_TIMING_AVAIL) diff --git a/string/test-strspn.c b/string/test-strspn.c index 4a64752..8701687 100644 --- a/string/test-strspn.c +++ b/string/test-strspn.c @@ -99,7 +99,7 @@ do_test (size_t align, size_t pos, size_t len) char *acc, *s; align &= 7; - if (align + pos >= page_size || len > 240 || ! len) + if (align + pos + 10 >= page_size || len > 240 || ! len) return; acc = buf2 + (random () & 255); @@ -120,6 +120,12 @@ do_test (size_t align, size_t pos, size_t len) s[pos] = random () & 255; if (strchr (acc, s[pos])) s[pos] = '\0'; + else + { + for (i = pos + 1; i < pos + 10; ++i) + s[i] = random () & 255; + s[i] = '\0'; + } if (HP_TIMING_AVAIL) printf ("Length %4zd, alignment %2zd, acc len %2zd:", pos, align, len); diff --git a/sysdeps/unix/sysv/linux/hppa/mmap64.c b/sysdeps/unix/sysv/linux/hppa/mmap64.c deleted file mode 100644 index cf7a5dc..0000000 --- a/sysdeps/unix/sysv/linux/hppa/mmap64.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index 7d75a24..ea7cd32 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Daniel Jacobowitz , 1999. + Contributed by Jakub Jelinek , 1999. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -19,21 +19,67 @@ #include #include +#include #include #include +#include -#include +#include "kernel-features.h" + +#ifdef __NR_mmap2 +/* We have the system call that takes page number instead of byte address. */ +extern void *__unbounded __syscall_mmap2 (void *__unbounded, size_t, + int, int, int, off_t); + +/* This is always 12, even on architectures where PAGE_SHIFT != 12. */ +# ifndef MMAP2_PAGE_SHIFT +# define MMAP2_PAGE_SHIFT 12 +# endif -__ptr_t -__mmap64 (addr, len, prot, flags, fd, offset) - __ptr_t addr; - size_t len; - int prot; - int flags; - int fd; - off64_t offset; +# ifndef __ASSUME_MMAP2_SYSCALL +static int have_no_mmap2; +# endif +#endif + + +void * +__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) { +#ifdef __NR_mmap2 + if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) + { + __set_errno (EINVAL); + return MAP_FAILED; + } +# ifndef __ASSUME_MMAP2_SYSCALL + if (! have_no_mmap2) +# endif + { +# ifndef __ASSUME_MMAP2_SYSCALL + int saved_errno = errno; +# endif + void *result; + __ptrvalue (result) = (void *__unbounded) + INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), + len, prot, flags, fd, + (off_t) (offset >> MMAP2_PAGE_SHIFT)); +# if __BOUNDED_POINTERS__ + __ptrlow (result) = __ptrvalue (result); + __ptrhigh (result) = __ptrvalue (result) + len; +# endif +# ifndef __ASSUME_MMAP2_SYSCALL + if (result != MAP_FAILED || errno != ENOSYS) +# endif + return result; + +# ifndef __ASSUME_MMAP2_SYSCALL + __set_errno (saved_errno); + have_no_mmap2 = 1; +# endif + } +#endif +#ifndef __ASSUME_MMAP2_SYSCALL if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) { __set_errno (EINVAL); @@ -41,6 +87,6 @@ __mmap64 (addr, len, prot, flags, fd, offset) } return __mmap (addr, len, prot, flags, fd, (off_t) offset); +#endif } - weak_alias (__mmap64, mmap64) diff --git a/sysdeps/unix/sysv/linux/powerpc/mmap64.c b/sysdeps/unix/sysv/linux/powerpc/mmap64.c deleted file mode 100644 index 63f32e9..0000000 --- a/sysdeps/unix/sysv/linux/powerpc/mmap64.c +++ /dev/null @@ -1,89 +0,0 @@ -/* Copyright (C) 1999,2000,01,02 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 1999. - - 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 -#include -#include - -#include -#include -#include - -#include "kernel-features.h" - -/* This is always the constant 12 for this routine, even if the actual - page size is larger. */ -#define PAGE_SHIFT 12 - -#ifdef __NR_mmap2 -extern void *__unbounded __syscall_mmap2(void *__unbounded, size_t, - int, int, int, off_t); -#ifndef __ASSUME_MMAP2_SYSCALL -static int have_no_mmap2; -#endif -#endif - -void * -__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) -{ - if (offset & ((1 << PAGE_SHIFT)-1)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } -#ifdef __NR_mmap2 -# ifndef __ASSUME_MMAP2_SYSCALL - if (! have_no_mmap2) -# endif - { -# ifndef __ASSUME_MMAP2_SYSCALL - int saved_errno = errno; -# endif - void *result; - __ptrvalue (result) - = (void *) INLINE_SYSCALL (mmap2, 6, __ptrvalue (addr), len, - prot, flags, fd, - (off_t) (offset >> PAGE_SHIFT)); -# if __BOUNDED_POINTERS__ - __ptrlow (result) = __ptrvalue (result); - __ptrhigh (result) = __ptrvalue (result) + len; -# endif -# ifndef __ASSUME_MMAP2_SYSCALL - if (result != MAP_FAILED || errno != ENOSYS) -# endif - return result; - -# ifndef __ASSUME_MMAP2_SYSCALL - __set_errno (saved_errno); - have_no_mmap2 = 1; -# endif - } -#endif -#ifndef __ASSUME_MMAP2_SYSCALL - if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } - - return __mmap (addr, len, prot, flags, fd, (off_t) offset); -#endif -} - -weak_alias (__mmap64, mmap64) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c b/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c deleted file mode 100644 index ca3cf36..0000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 1999. - - 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 -#include -#include - -#include -#include -#include - -#include "kernel-features.h" - -#ifdef __NR_mmap2 -extern void *__unbounded __syscall_mmap2 (void *__unbounded, size_t, - int, int, int, off_t); -# ifndef __ASSUME_MMAP2_SYSCALL -static int have_no_mmap2; -# endif -#endif - -__ptr_t -__mmap64 (__ptr_t addr, size_t len, int prot, int flags, int fd, off64_t offset) -{ -#ifdef __NR_mmap2 - if ( -# ifndef __ASSUME_MMAP2_SYSCALL - ! have_no_mmap2 && -# endif - ! (offset & 4095)) - { -# ifndef __ASSUME_MMAP2_SYSCALL - int saved_errno = errno; -# endif - /* This will be always 12, no matter what page size is. */ - __ptr_t result; - __ptrvalue (result) = - (void *__unbounded) INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags, - fd, (off_t) (offset >> 12)); -# if __BOUNDED_POINTERS__ - __ptrlow (result) = __ptrvalue (result); - __ptrhigh (result) = __ptrvalue (result) + len; -# endif -# ifndef __ASSUME_MMAP2_SYSCALL - if (result != (__ptr_t) -1 || errno != ENOSYS) -# endif - return result; - -# ifndef __ASSUME_MMAP2_SYSCALL - __set_errno (saved_errno); - have_no_mmap2 = 1; -# endif - } -#endif - if (offset != (off_t) offset || (offset + len) != (off_t) (offset + len)) - { - __set_errno (EINVAL); - return MAP_FAILED; - } - - return __mmap (addr, len, prot, flags, fd, (off_t) offset); -} - -weak_alias (__mmap64, mmap64) -- 2.7.4