X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=cda7ab6579d4f45ef9d47580fb5ef540e070d094;hb=0711226145f12c37217681b57944860bdeb6ace0;hp=30086ab1d38a62dd2d72af1cc23cbe2d8037be06;hpb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;p=pdclib

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 30086ab..cda7ab6 100644
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* vsnprintf( char *, size_t, const char *, va_list ap )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -12,25 +10,78 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-typedef char wchar_t;
-
-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 */
+            if ( status.i < n )
+            {
+                s[ status.i ] = *format;
+            }
+            status.i++;
+            format++;
+        }
+        else
+        {
+            /* Continue parsing after conversion specifier */
+            format = rc;
+        }
+    }
+    if ( status.i  < n )
+    {
+        s[ status.i ] = '\0';
+    }
+    va_end( status.arg );
+    return status.i;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vsnprintf.c"
+#define _PDCLIB_STRINGIO
+#include <stdint.h>
+#include <stddef.h>
 #include <_PDCLIB_test.h>
 
+static int testprintf( char * s, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vsnprintf( s, 100, format, arg );
+    va_end( arg );
+    return i;
+}
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }
 
 #endif
+