projects
/
fw
/
pdclib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further output beautification.
[fw/pdclib]
/
functions
/
string
/
strncpy.c
diff --git
a/functions/string/strncpy.c
b/functions/string/strncpy.c
index e1f34a7f8558b83734b0ce8cb967c809120de74e..2fb3f000e947a179ee77e5f279cfd23acb1974dd 100644
(file)
--- a/
functions/string/strncpy.c
+++ b/
functions/string/strncpy.c
@@
-1,7
+1,5
@@
/* $Id$ */
/* $Id$ */
-/* Release $Name$ */
-
/* strncpy( char *, const char *, size_t )
This file is part of the Public Domain C Library (PDCLib).
/* strncpy( char *, const char *, size_t )
This file is part of the Public Domain C Library (PDCLib).
@@
-10,6
+8,9
@@
#include <string.h>
#include <string.h>
+/* TODO: Debuggung only */
+#include <stdio.h>
+
#ifndef REGTEST
char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
#ifndef REGTEST
char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
@@
-18,13
+19,19
@@
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
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;
}
*/
--n;
}
- while ( --n )
+ /* TODO: This works correctly, but somehow the handling of n is ugly as
+ hell.
+ */
+ if ( n > 0 )
{
{
- *s1++ = '\0';
+ while ( --n )
+ {
+ *s1++ = '\0';
+ }
}
return rc;
}
}
return rc;
}
@@
-34,10
+41,9
@@
char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
#ifdef TEST
#include <_PDCLIB_test.h>
#ifdef TEST
#include <_PDCLIB_test.h>
-int main()
+int main(
void
)
{
char s[] = "xxxxxxx";
{
char s[] = "xxxxxxx";
- BEGIN_TESTS;
TESTCASE( strncpy( s, "", 1 ) == s );
TESTCASE( s[0] == '\0' );
TESTCASE( s[1] == 'x' );
TESTCASE( strncpy( s, "", 1 ) == s );
TESTCASE( s[0] == '\0' );
TESTCASE( s[1] == 'x' );
@@
-48,6
+54,10
@@
int main()
TESTCASE( s[6] == 'x' );
TESTCASE( strncpy( s, abcde, 7 ) == s );
TESTCASE( s[6] == '\0' );
TESTCASE( s[6] == 'x' );
TESTCASE( strncpy( s, abcde, 7 ) == s );
TESTCASE( s[6] == '\0' );
+ TESTCASE( strncpy( s, "xxxx", 3 ) == s );
+ TESTCASE( s[0] == 'x' );
+ TESTCASE( s[2] == 'x' );
+ TESTCASE( s[3] == 'd' );
return TEST_RESULTS;
}
#endif
return TEST_RESULTS;
}
#endif