diff options
| author | Mattias Andrée <maandree@kth.se> | 2018-08-18 23:40:11 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2018-08-18 23:40:11 +0200 |
| commit | 3e746c51b3adcf97e4d11be30bfd91c8aaf2c2ba (patch) | |
| tree | a00b8ec51cfaf110d8bf36daa91827c95dc107e7 /strrcasestr.c | |
| parent | Improve makefile (diff) | |
| download | libsimple-3e746c51b3adcf97e4d11be30bfd91c8aaf2c2ba.tar.gz libsimple-3e746c51b3adcf97e4d11be30bfd91c8aaf2c2ba.tar.bz2 libsimple-3e746c51b3adcf97e4d11be30bfd91c8aaf2c2ba.tar.xz | |
Fix and run tests
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | strrcasestr.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/strrcasestr.c b/strrcasestr.c index 9bd40b3..2b1f2ab 100644 --- a/strrcasestr.c +++ b/strrcasestr.c @@ -1,5 +1,6 @@ /* See LICENSE file for copyright and license details. */ #include "libsimple.h" +#ifndef TEST char * @@ -8,25 +9,28 @@ libsimple_strrcasestr(const char *h_, const char *n) char *h = *(char **)(void *)&h_; size_t hn = strlen(h); size_t nn = strlen(n); + if (!nn) + return &h[hn]; if (hn < nn) return NULL; for (h += hn -= nn; hn--; h--) - if (!strcasecmp(h, n)) + if (!strncasecmp(h, n, nn)) return h; + if (!strncasecmp(h, n, nn)) + return h; return NULL; } -#ifdef TEST -#include <assert.h> +#else +#include "test.h" int main(void) { assert(!strcmp(libsimple_strrcasestr("", ""), "")); assert(!strcmp(libsimple_strrcasestr("test", ""), "")); - assert(!libsimple_strrcasestr("", "")); - assert(!libsimple_strrcasestr("t", "t")); + assert(!strcmp(libsimple_strrcasestr("t", "t"), "t")); assert(!strcmp(libsimple_strrcasestr("test", "t"), "t")); assert(!strcmp(libsimple_strrcasestr("test", "e"), "est")); assert(!strcmp(libsimple_strrcasestr("test", "s"), "st")); |