From b5ca6729c7b52e8cade6d3808ad8280845ac32ea Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 23 Nov 2018 20:38:54 +0100 Subject: Some fixes and tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- strcmove.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 4 deletions(-) (limited to 'strcmove.c') diff --git a/strcmove.c b/strcmove.c index 2adc49d..8737061 100644 --- a/strcmove.c +++ b/strcmove.c @@ -4,21 +4,25 @@ char * -libsimple_strcmove(char *d, const char *s, int c_) /* TODO test, man */ +libsimple_strcmove(char *d, const char *s, int c_) /* TODO man */ { char c = (char)c_, *p; size_t n; - if (d < s) { + if (d <= s) { do { - if ((*d++ = *s) == c) + if ((*d++ = *s) == c) { + *d = '\0'; return d; + } } while (*s++); } else { for (p = *(char **)(void *)&s;; p++) { - if (*p == c || *p) { + if (*p == c || !*p) { n = (size_t)(p - s); p = &d[n]; do { d[n] = s[n]; } while (n--); + if (*p) + p[1] = '\0'; return *p == c ? &p[1] : NULL; } } @@ -33,6 +37,72 @@ libsimple_strcmove(char *d, const char *s, int c_) /* TODO test, man */ int main(void) { + char buf[1024]; + + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[5], &buf[5], '\0') == &buf[5 + 6]); + assert(!strcmp(buf, "-----hello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[5], &buf[5], 'o') == &buf[5 + 5]); + assert(!strcmp(buf, "-----hello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[5], &buf[5], 'l') == &buf[5 + 3]); + assert(!strcmp(buf, "-----hel")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[5], &buf[5], 'x') == NULL); + assert(!strcmp(buf, "-----hello")); + + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[3], &buf[5], '\0') == &buf[3 + 6]); + assert(!strcmp(buf, "---hello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[3], &buf[5], 'o') == &buf[3 + 5]); + assert(!strcmp(buf, "---hello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[3], &buf[5], 'l') == &buf[3 + 3]); + assert(!strcmp(buf, "---hel")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[3], &buf[5], 'x') == NULL); + assert(!strcmp(buf, "---hello")); + + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[8], &buf[5], '\0') == &buf[8 + 6]); + assert(!strcmp(buf, "-----helhello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[8], &buf[5], 'o') == &buf[8 + 5]); + assert(!strcmp(buf, "-----helhello")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[8], &buf[5], 'l') == &buf[8 + 3]); + assert(!strcmp(buf, "-----helhel")); + + memset(buf, '-', sizeof(buf)), buf[sizeof(buf) - 1] = '\0'; + strcpy(&buf[5], "hello"); + assert(libsimple_strcmove(&buf[8], &buf[5], 'x') == NULL); + assert(!strcmp(buf, "-----helhello")); + + return 0; } -- cgit v1.2.3-70-g09d2