aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-23 04:13:42 +0000
committerRoland McGrath <roland@gnu.org>2002-09-23 04:13:42 +0000
commit2e35d8c8e1c4a2f5b17eb3afa91ce1de7a1ab9e5 (patch)
treee60912c25efc0da3a308f4bdcef5cf86c25fecc6 /string
parentdf075e0920223f12ffb8d0a0e54c9d5db181ee76 (diff)
downloadglibc-2e35d8c8e1c4a2f5b17eb3afa91ce1de7a1ab9e5.tar
glibc-2e35d8c8e1c4a2f5b17eb3afa91ce1de7a1ab9e5.tar.gz
glibc-2e35d8c8e1c4a2f5b17eb3afa91ce1de7a1ab9e5.tar.bz2
glibc-2e35d8c8e1c4a2f5b17eb3afa91ce1de7a1ab9e5.zip
unnecessary with stratcliff
Diffstat (limited to 'string')
-rw-r--r--string/Makefile2
-rw-r--r--string/bug-stpncpy-offend.c53
2 files changed, 1 insertions, 54 deletions
diff --git a/string/Makefile b/string/Makefile
index b0f55718b7..eed07fcace 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -48,7 +48,7 @@ o-objects.ob := memcpy.o memset.o memchr.o
tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strlen stratcliff tst-svc tst-inlcall \
bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \
- tst-strtok tst-strxfrm bug-strcoll1 bug-stpncpy-offend
+ tst-strtok tst-strxfrm bug-strcoll1
distribute := memcopy.h pagecopy.h tst-svc.expect
diff --git a/string/bug-stpncpy-offend.c b/string/bug-stpncpy-offend.c
deleted file mode 100644
index 3a782f7cd7..0000000000
--- a/string/bug-stpncpy-offend.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Test program for stpncpy reading off the end of the source string. */
-
-#include <string.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-static int do_test (void);
-#define TEST_FUNCTION do_test ()
-#include <test-skeleton.c>
-
-static int
-do_test (void)
-{
- /* We get two pages of memory and then protect the second one so
- we are sure to fault if we access past the end of the first page.
- Then we test the odd-size string ending just on the page boundary. */
-
- static const char test_string[] = "Seven.";
- const size_t pagesz = getpagesize ();
- char *buf = mmap (NULL, pagesz * 2,
- PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
- char *s1, *r;
- volatile size_t len = sizeof test_string;
-
- if (buf == MAP_FAILED)
- {
- perror ("mmap");
- return 1;
- }
- if (mprotect (buf + pagesz, pagesz, PROT_NONE) != 0)
- {
- perror ("mprotect");
- return 2;
- }
-
- s1 = buf + pagesz - sizeof test_string;
- memcpy (s1, test_string, sizeof test_string);
-
- r = stpncpy (buf, s1, len);
- if (r != buf + len - 1)
- {
- printf ("r = buf + %d != %zu\n", r - buf, len - 1);
- return 3;
- }
- r = stpncpy (s1, buf, len);
- if (r != s1 + len - 1)
- {
- printf ("r = s1 + %d != %zu\n", r - s1, len - 1);
- return 3;
- }
-
- return 0;
-}