diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-10-04 07:30:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-10-04 07:30:05 +0000 |
| commit | fbda91b119b7673a4d448f0dce31766eaa65112e (patch) | |
| tree | 432f48a3043ee1216216e6b93547017b954cde9c /string | |
| parent | ba60c6d921580bd4b1adf24506bcebfd8efdea34 (diff) | |
| download | glibc-fbda91b119b7673a4d448f0dce31766eaa65112e.tar glibc-fbda91b119b7673a4d448f0dce31766eaa65112e.tar.gz glibc-fbda91b119b7673a4d448f0dce31766eaa65112e.tar.bz2 glibc-fbda91b119b7673a4d448f0dce31766eaa65112e.zip | |
Update.
1999-10-04 Ulrich Drepper <drepper@cygnus.com>
* include/string.h: Add __memrchr declaration.
* string/string.h: Moce __memrchr declaration to include/string.h.
1999-10-03 Ulrich Drepper <drepper@cygnus.com>
* string/Makefile (routines): Add memrchr.
* sysdeps/generic/memrchr.c: Don't undef memchr, undef memrchr.
Correct order of tests for matching bytes.
* string/tester.c: Add tests for memrchr.
* sysdeps/i386/i486/bits/string.h (__memrchr): Correct implementation.
Start from the last character and take decrement not increment
into account for correction in return line. Add memrchr alias.
* sysdeps/i386/bits/string.h: Likewise.
Diffstat (limited to 'string')
| -rw-r--r-- | string/string.h | 1 | ||||
| -rw-r--r-- | string/tester.c | 49 |
2 files changed, 49 insertions, 1 deletions
diff --git a/string/string.h b/string/string.h index 03cf103ad6..a09d42a207 100644 --- a/string/string.h +++ b/string/string.h @@ -66,7 +66,6 @@ extern __ptr_t memchr __P ((__const __ptr_t __s, int __c, size_t __n)); extern __ptr_t rawmemchr __P ((__const __ptr_t __s, int __c)); /* Search N bytes of S for the final occurrence of C. */ -extern __ptr_t __memrchr __P ((__const __ptr_t __s, int __c, size_t __n)); extern __ptr_t memrchr __P ((__const __ptr_t __s, int __c, size_t __n)); #endif diff --git a/string/tester.c b/string/tester.c index 5105e4eea4..4fed10e4b4 100644 --- a/string/tester.c +++ b/string/tester.c @@ -564,6 +564,52 @@ test_strrchr (void) } void +test_memrchr (void) +{ + size_t l; + it = "memrchr"; + check (memrchr ("abcd", 'z', 5) == NULL, 1); /* Not found. */ + (void) strcpy (one, "abcd"); + l = strlen (one) + 1; + check (memrchr (one, 'c', l) == one+2, 2); /* Basic test. */ + check (memrchr (one, 'd', l) == one+3, 3); /* End of string. */ + check (memrchr (one, 'a', l) == one, 4); /* Beginning. */ + check (memrchr (one, '\0', l) == one+4, 5); /* Finding NUL. */ + (void) strcpy (one, "ababa"); + l = strlen (one) + 1; + check (memrchr (one, 'b', l) == one+3, 6); /* Finding last. */ + (void) strcpy (one, ""); + l = strlen (one) + 1; + check (memrchr (one, 'b', l) == NULL, 7); /* Empty string. */ + check (memrchr (one, '\0', l) == one, 8); /* NUL in empty string. */ + + /* now test all possible alignment and length combinations to catch + bugs due to unrolled loops (assuming unrolling is limited to no + more than 128 byte chunks: */ + { + char buf[128 + sizeof(long)]; + long align, len, i, pos; + + for (align = 0; align < (long) sizeof(long); ++align) { + for (len = 0; len < (long) (sizeof(buf) - align); ++len) { + for (i = 0; i < len; ++i) + buf[align + i] = 'x'; /* don't depend on memset... */ + + for (pos = len - 1; pos >= 0; --pos) { +#if 0 + printf("align %d, len %d, pos %d\n", align, len, pos); +#endif + check(memrchr(buf + align, 'x', len) == buf + align + pos, 9); + check(memrchr(buf + align + pos + 1, 'x', len - (pos + 1)) == NULL, + 10); + buf[align + pos] = '-'; + } + } + } + } +} + +void test_rindex (void) { it = "rindex"; @@ -1183,6 +1229,9 @@ main (void) /* strrchr. */ test_strrchr (); + /* memrchr. */ + test_memrchr (); + /* rindex - just like strrchr. */ test_rindex (); |