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

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index fd9b4ac..fd29580 100644
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -10,8 +10,12 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict 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.  */
     struct _PDCLIB_status_t status;
@@ -32,7 +36,12 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric
         if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
         {
             /* No conversion specifier, print verbatim */
-            s[ status.i++ ] = *(format++);
+            if ( status.i < n )
+            {
+                s[ status.i ] = *format;
+            }
+            status.i++;
+            format++;
         }
         else
         {
@@ -40,7 +49,10 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric
             format = rc;
         }
     }
-    s[ status.i ] = '\0';
+    if ( status.i  < n )
+    {
+        s[ status.i ] = '\0';
+    }
     va_end( status.arg );
     return status.i;
 }
@@ -48,28 +60,25 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsnprintf.c"
+#define _PDCLIB_STRINGIO
 
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
+#include <_PDCLIB_test.h>
 
-static int testprintf( char * s, size_t n, const char * format, ... )
+static int testprintf( char * s, const char * format, ... )
 {
     int i;
     va_list arg;
     va_start( arg, format );
-    i = vsnprintf( s, n, format, arg );
+    i = vsnprintf( s, 100, format, arg );
     va_end( arg );
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
-
 int main( void )
 {
-    char buffer[100];
-#include "printf_testcases.incl"
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }