X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=a8f568469cd101a713f6a660b9151a2c928893d6;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=fd29580db984b072ed1d80b699b51b97d452f167;hpb=0a419d48138f1411d6e3e50a367b9ece5a2cf893;p=pdclib

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index fd29580..a8f5684 100644
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vsnprintf( char *, size_t, const char *, va_list ap )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,50 +9,38 @@
 
 #ifndef REGTEST
 #include <_PDCLIB_io.h>
+#include <string.h>
 
-int vsnprintf( char * _PDCLIB_restrict s, 
-               size_t n, 
-               const char * _PDCLIB_restrict format, 
-               _PDCLIB_va_list arg )
+struct state {
+    size_t bufrem;
+    char *bufp;
+};
+
+static size_t strout( void *p, const char *buf, size_t sz )
 {
-    /* 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 );
+    struct state *s = p;
+    size_t copy = s->bufrem >= sz ? sz : s->bufrem;
+    memcpy( s->bufp, buf, copy );
+    s->bufrem -= copy;
+    s->bufp   += copy;
+    return sz;
+}
 
-    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 )
+int vsnprintf( char * _PDCLIB_restrict s,
+               size_t n,
+               const char * _PDCLIB_restrict format,
+               _PDCLIB_va_list arg )
+{
+    struct state st;
+    st.bufrem = n;
+    st.bufp   = s;
+    int r = _vcbprintf( &st, strout, format, arg );
+    if ( st.bufrem )
     {
-        s[ status.i ] = '\0';
+        *st.bufp = 0;
     }
-    va_end( status.arg );
-    return status.i;
+
+    return r;
 }
 
 #endif
@@ -62,7 +48,8 @@ int vsnprintf( char * _PDCLIB_restrict s,
 #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, ... )