X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=a46491d157d8bb7bd0607e9f56bda55bef6783fe;hb=689f876fb2420ed2ce45aca58dc39f05e1eb5c2d;hp=9e54dca1bb392076e07c0566fa6449403b24b90b;hpb=0f88da0454edf3c1ca1a7f786c2fd9afdef0eb9c;p=pdclib

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 9e54dca..a46491d 100644
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* vsnprintf( char *, size_t, const char *, va_list ap )
+/* vsnprintf( char *, size_t, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -32,7 +30,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 +43,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;
 }
@@ -49,11 +55,10 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric
 
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/vsnprintf.c"
-#include <_PDCLIB_test.h>
-
-#include <limits.h>
+#define _PDCLIB_STRINGIO
 #include <stdint.h>
-#include <string.h>
+#include <stddef.h>
+#include "_PDCLIB_test.h"
 
 static int testprintf( char * s, const char * format, ... )
 {
@@ -68,9 +73,8 @@ static int testprintf( char * s, const char * format, ... )
 int main( void )
 {
     char target[100];
-#include "printf_testcases.incl"
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }
 
 #endif
-