From 3e746c51b3adcf97e4d11be30bfd91c8aaf2c2ba Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 18 Aug 2018 23:40:11 +0200 Subject: Fix and run tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- strrcasestr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'strrcasestr.c') 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 +#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")); -- cgit v1.2.3-70-g09d2