Further streamlined testing.

[fw/pdclib] / functions / stdio / vsnprintf.c

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 08f235530a68a8b843e53c06422bef19146b746a..fd9b4ac3fc34e5cb57477395371164b6536e3eaf 100644 (file)
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -11,11 +11,38 @@
 
 #ifndef REGTEST
 
-int vsnprintf( char * str, size_t size, const char * format, _PDCLIB_va_list arg )
+int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict format, _PDCLIB_va_list arg )
 {
-    /* TODO: This function should interpret format as multibyte characters. */
-    /* TODO: Implement */
-    return 0;
+    /* TODO: This function should interpret format as multibyte characters.  */
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = n;
+    status.i = 0;
+    status.current = 0;
+    status.s = s;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = NULL;
+    va_copy( status.arg, arg );
+
+    while ( *format != '\0' )
+    {
+        const char * rc;
+        if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
+        {
+            /* No conversion specifier, print verbatim */
+            s[ status.i++ ] = *(format++);
+        }
+        else
+        {
+            /* Continue parsing after conversion specifier */
+            format = rc;
+        }
+    }
+    s[ status.i ] = '\0';
+    va_end( status.arg );
+    return status.i;
 }
 
 #endif
@@ -23,10 +50,28 @@ int vsnprintf( char * str, size_t size, const char * format, _PDCLIB_va_list arg
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+static int testprintf( char * s, size_t n, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vsnprintf( s, n, format, arg );
+    va_end( arg );
+    return i;
+}
+
+#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char buffer[100];
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }
 
 #endif
+