narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

At least cope with "%llx" by reading the correct-sized va_arg from the 

stack, even if we don't yet print it out.

At some point, vsprintf() needs to be fixed up so that it can correctly
cope with limited-sized buffers (i.e. vsnprintf), long longs, and
standard format specifiers (e.g. "%04x").  We should also remove the
special types (MAC addresses and IP addresses).  This would then enable
us to use gcc's ability to type-check printf format strings.
pull/1/head
Michael Brown 2006-05-13 11:50:52 +00:00
parent 21493646c2
commit f99e7a375e
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/vsprintf.c
View File

@ -5,10 +5,11 @@
#include "errno.h" #include "errno.h"
#include "vsprintf.h" #include "vsprintf.h"
#define LONG_SHIFT ((int)((sizeof(unsigned long)*CHAR_BIT) - 4)) #define LONGLONG_SHIFT ((int)((sizeof(unsigned long long)*CHAR_BIT) - 4))
#define INT_SHIFT ((int)((sizeof(unsigned int)*CHAR_BIT) - 4)) #define LONG_SHIFT ((int)((sizeof(unsigned long)*CHAR_BIT) - 4))
#define SHRT_SHIFT ((int)((sizeof(unsigned short)*CHAR_BIT) - 4)) #define INT_SHIFT ((int)((sizeof(unsigned int)*CHAR_BIT) - 4))
#define CHAR_SHIFT ((int)((sizeof(unsigned char)*CHAR_BIT) - 4)) #define SHRT_SHIFT ((int)((sizeof(unsigned short)*CHAR_BIT) - 4))
#define CHAR_SHIFT ((int)((sizeof(unsigned char)*CHAR_BIT) - 4))
/** @file */ /** @file */
@ -62,7 +63,11 @@ static int vsprintf(char *buf, const char *fmt, va_list args)
shift = LONG_SHIFT; shift = LONG_SHIFT;
fmt++; fmt++;
} }
else if (*fmt == 'h') { if (*fmt == 'l') {
shift = LONGLONG_SHIFT;
fmt++;
}
if (*fmt == 'h') {
shift = SHRT_SHIFT; shift = SHRT_SHIFT;
fmt++; fmt++;
if (*fmt == 'h') { if (*fmt == 'h') {
@ -79,7 +84,9 @@ static int vsprintf(char *buf, const char *fmt, va_list args)
/* With x86 gcc, sizeof(long) == sizeof(int) */ /* With x86 gcc, sizeof(long) == sizeof(int) */
unsigned long h; unsigned long h;
int ncase; int ncase;
if (shift > INT_SHIFT) { if (shift > LONG_SHIFT) {
h = va_arg(args, unsigned long long);
} else if (shift > INT_SHIFT) {
h = va_arg(args, unsigned long); h = va_arg(args, unsigned long);
} else { } else {
h = va_arg(args, unsigned int); h = va_arg(args, unsigned int);
@ -95,7 +102,9 @@ static int vsprintf(char *buf, const char *fmt, va_list args)
else if (*fmt == 'd') { else if (*fmt == 'd') {
char *r, *t; char *r, *t;
long i; long i;
if (shift > INT_SHIFT) { if (shift > LONG_SHIFT) {
i = va_arg(args, long long);
} else if (shift > INT_SHIFT) {
i = va_arg(args, long); i = va_arg(args, long);
} else { } else {
i = va_arg(args, int); i = va_arg(args, int);