LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix bugs in processNumber()

Browse Source
This commit is contained in:
Aurora Wright 2017-05-08 04:49:20 +02:00
parent 033d90b866
commit 5b9b22021b
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/fmt.c
View File

@ -56,8 +56,6 @@ static u32 skipAtoi(const char **s)
static char *processNumber(char *str, s64 num, bool isHex, s32 size, s32 precision, u32 type) static char *processNumber(char *str, s64 num, bool isHex, s32 size, s32 precision, u32 type)
{ {
if(type & LEFT) type &= ~ZEROPAD;
char sign = 0; char sign = 0;
if(type & SIGN) if(type & SIGN)
@ -80,20 +78,21 @@ static char *processNumber(char *str, s64 num, bool isHex, s32 size, s32 precisi
} }
} }
if(type & HEX_PREP && isHex) size -= 2;
static const char *lowerDigits = "0123456789abcdef", static const char *lowerDigits = "0123456789abcdef",
*upperDigits = "0123456789ABCDEF"; *upperDigits = "0123456789ABCDEF";
s32 i = 0; s32 i = 0;
char tmp[66], char tmp[20];
c = (type & ZEROPAD) ? '0' : ' ';
const char *dig = (type & UPPERCASE) ? upperDigits : lowerDigits; const char *dig = (type & UPPERCASE) ? upperDigits : lowerDigits;
if(num == 0) tmp[i++] = '0'; if(num == 0)
{
if(precision != 0) tmp[i++] = '0';
type &= ~HEX_PREP;
}
else else
{ {
while (num != 0) while(num != 0)
{ {
u64 base = isHex ? 16ULL : 10ULL; u64 base = isHex ? 16ULL : 10ULL;
tmp[i++] = dig[(u64)num % base]; tmp[i++] = dig[(u64)num % base];
@ -101,6 +100,8 @@ static char *processNumber(char *str, s64 num, bool isHex, s32 size, s32 precisi
} }
} }
if(type & LEFT || precision != -1) type &= ~ZEROPAD;
if(type & HEX_PREP && isHex) size -= 2;
if(i > precision) precision = i; if(i > precision) precision = i;
size -= precision; size -= precision;
if(!(type & (ZEROPAD | LEFT))) while(size-- > 0) *str++ = ' '; if(!(type & (ZEROPAD | LEFT))) while(size-- > 0) *str++ = ' ';
@ -112,7 +113,7 @@ static char *processNumber(char *str, s64 num, bool isHex, s32 size, s32 precisi
*str++ = 'x'; *str++ = 'x';
} }
if(!(type & LEFT)) while(size-- > 0) *str++ = c; if(type & ZEROPAD) while(size-- > 0) *str++ = '0';
while(i < precision--) *str++ = '0'; while(i < precision--) *str++ = '0';
while(i-- > 0) *str++ = tmp[i]; while(i-- > 0) *str++ = tmp[i];
while(size-- > 0) *str++ = ' '; while(size-- > 0) *str++ = ' ';
@ -182,18 +183,27 @@ u32 vsprintf(char *buf, const char *fmt, va_list args)
} }
//Get the conversion qualifier //Get the conversion qualifier
bool isLongLong = false; u32 integerType = 0;
if(*fmt == 'l') if(*fmt == 'l')
{ {
if(*++fmt == 'l') if(*++fmt == 'l')
{ {
fmt++; fmt++;
isLongLong = true; integerType = 1;
}
} }
//Default base }
bool isHex = false; else if(*fmt == 'h')
{
if(*++fmt == 'h')
{
fmt++;
integerType = 3;
}
else integerType = 2;
}
bool isHex;
switch(*fmt) switch(*fmt)
{ {
@ -236,6 +246,7 @@ u32 vsprintf(char *buf, const char *fmt, va_list args)
flags |= SIGN; flags |= SIGN;
case 'u': case 'u':
isHex = false;
break; break;
default: default:
@ -249,13 +260,19 @@ u32 vsprintf(char *buf, const char *fmt, va_list args)
if(flags & SIGN) if(flags & SIGN)
{ {
if(isLongLong) num = va_arg(args, s64); if(integerType == 1) va_arg(args, s64);
else num = va_arg(args, s32); else num = va_arg(args, s32);
if(integerType == 2) num = (s16)num;
else if(integerType == 3) num = (s8)num;
} }
else else
{ {
if(isLongLong) num = va_arg(args, u64); if(integerType == 1) va_arg(args, u64);
else num = va_arg(args, u32); else num = va_arg(args, u32);
if(integerType == 2) num = (u16)num;
else if(integerType == 3) num = (u8)num;
} }
str = processNumber(str, num, isHex, fieldWidth, precision, flags); str = processNumber(str, num, isHex, fieldWidth, precision, flags);