X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=e890c71a48173c1e5edc3d9c861b00e8891e6cc6;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=9eb869e78cb2b7dbb52c9eab259b0fba1670283c;hpb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;p=pdclib diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c index 9eb869e..e890c71 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; } @@ -51,7 +57,7 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restric #define _PDCLIB_FILEID "stdio/vsnprintf.c" #define _PDCLIB_STRINGIO -#include <_PDCLIB_test.h> +#include "_PDCLIB_test.h" static int testprintf( char * s, const char * format, ... ) {