vsprintf: add z and t options

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/lib_generic/vsprintf.c b/lib_generic/vsprintf.c
index 3db6c3f936ce8c418d7a69342ff8faf7b1fc1985..7c9cfe16cefa83e9a665fc04b3776f875acd8b43 100644 (file)
--- a/lib_generic/vsprintf.c
+++ b/lib_generic/vsprintf.c
@@ -262,7 +262,9 @@ int vsprintf(char *buf, const char *fmt, va_list args)
 
                /* get the conversion qualifier */
                qualifier = -1;
-               if (*fmt == 'h' || *fmt == 'l' || *fmt == 'q') {
+               if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
+                   *fmt == 'Z' || *fmt == 'z' || *fmt == 't' ||
+                   *fmt == 'q' ) {
                        qualifier = *fmt;
                        if (qualifier == 'l' && *(fmt+1) == 'l') {
                                qualifier = 'q';
@@ -355,9 +357,13 @@ int vsprintf(char *buf, const char *fmt, va_list args)
                        num = va_arg(args, unsigned long long);
                else
 #endif
-               if (qualifier == 'l')
+               if (qualifier == 'l') {
                        num = va_arg(args, unsigned long);
-               else if (qualifier == 'h') {
+               } else if (qualifier == 'Z' || qualifier == 'z') {
+                       num = va_arg(args, size_t);
+               } else if (qualifier == 't') {
+                       num = va_arg(args, ptrdiff_t);
+               } else if (qualifier == 'h') {
                        num = (unsigned short) va_arg(args, int);
                        if (flags & SIGN)
                                num = (short) num;