From 1a0d9f7faca36f149db3b85c09a72528e0c73a83 Mon Sep 17 00:00:00 2001 From: solar Date: Mon, 21 Nov 2005 18:04:55 +0000 Subject: [PATCH] Added test driver, fixed off-by-one bug. --- functions/string/strncpy.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c index b47be75..31602ec 100644 --- a/functions/string/strncpy.c +++ b/functions/string/strncpy.c @@ -17,22 +17,34 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si while ( ( n > 0 ) && ( *s1++ = *s2++ ) ) { /* Cannot do "n--" in the conditional as size_t is unsigned and we have - to check it again for >0 in the next loop. + to check it again for >0 in the next loop. */ --n; } - while ( n-- ) + while ( --n ) { *s1++ = '\0'; } return rc; } -#warning Test driver missing. - #ifdef TEST +#include <_PDCLIB_test.h> + int main() { - return 0; + char s[] = "xxxxxxx"; + BEGIN_TESTS; + TESTCASE( strncpy( s, "", 1 ) == s ); + TESTCASE( s[0] == '\0' ); + TESTCASE( s[1] == 'x' ); + TESTCASE( strncpy( s, abcde, 6 ) == s ); + TESTCASE( s[0] == 'a' ); + TESTCASE( s[4] == 'e' ); + TESTCASE( s[5] == '\0' ); + TESTCASE( s[6] == 'x' ); + TESTCASE( strncpy( s, abcde, 7 ) == s ); + TESTCASE( s[6] == '\0' ); + return TEST_RESULTS; } #endif -- 2.40.0