OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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  <roland@redhat.com>

	* string/test-string.h (test_init): Fill BUF1 and BUF2 with
	nonzero characters.

2002-09-22  H.J. Lu  <hjl@gnu.org>

	* 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,
This commit is contained in:
Roland McGrath 2002-11-09 00:36:21 +00:00
parent 2b49744308
commit 9372c95824
11 changed files with 104 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
2002-10-09 Jakub Jelinek <jakub@redhat.com>
* 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 <roland@redhat.com>
* string/test-string.h (test_init): Fill BUF1 and BUF2 with
nonzero characters.
2002-09-22 H.J. Lu <hjl@gnu.org>
* 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 <jakub@redhat.com>
* posix/bug-regex13.c (tests): Add new test.

4
string/test-stpncpy.c
View File

@ -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];

3
string/test-string.h
View File

@ -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

2
string/test-strncmp.c
View File

@ -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;

4
string/test-strncpy.c
View File

@ -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];

8
string/test-strpbrk.c
View File

@ -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)

8
string/test-strspn.c
View File

@ -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);

1
sysdeps/unix/sysv/linux/hppa/mmap64.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/powerpc/mmap64.c>

70
sysdeps/unix/sysv/linux/mmap64.c
View File

@ -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 <dan@debian.org>, 1999.
Contributed by Jakub Jelinek <jakub@redhat.com>, 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 <errno.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#include <sys/mman.h>
#include "kernel-features.h"
__ptr_t
__mmap64 (addr, len, prot, flags, fd, offset)
__ptr_t addr;
size_t len;
int prot;
int flags;
int fd;
off64_t offset;
#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
# 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)

89
sysdeps/unix/sysv/linux/powerpc/mmap64.c
View File

@ -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 <jakub@redhat.com>, 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 <errno.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#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)

80
sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c
View File

@ -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 <jakub@redhat.com>, 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 <errno.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#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)