Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-14 00:04:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup

Browse source 
Added '%I64' format type

svn path=/trunk/; revision=943
This commit is contained in:
Eric Kohl 2000-01-19 19:48:20 +00:00
parent 072eed4ad3
commit 1b92b852eb
1 changed files with 247 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

242
reactos/lib/crtdll/stdio/vfprintf.c
View file

@ -42,7 +42,7 @@ vfprintf(FILE *f, const char *fmt, va_list ap)
int int
vfwprintf(FILE *f, const wchar_t *fmt, va_list ap) vfwprintf(FILE *f, const wchar_t *fmt, va_list ap)
{ {
return 0;
} }
@ -64,7 +64,6 @@ vfwprintf(FILE *f, const wchar_t *fmt, va_list ap)
#include <stdarg.h> #include <stdarg.h>
//#include <internal/debug.h>
#include <crtdll/ctype.h> #include <crtdll/ctype.h>
#include <crtdll/string.h> #include <crtdll/string.h>
#include <crtdll/stdio.h> #include <crtdll/stdio.h>
@ -73,7 +72,14 @@ vfwprintf(FILE *f, const wchar_t *fmt, va_list ap)
#include <crtdll/internal/ieee.h> #include <crtdll/internal/ieee.h>
size_t strnlen( const char *string, size_t count ); #define ZEROPAD 1 /* pad with zero */
#define SIGN 2 /* unsigned/signed long */
#define PLUS 4 /* show plus */
#define SPACE 8 /* space if plus */
#define LEFT 16 /* left justified */
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
#define ZEROTRUNC 128 /* truncate zero 's */
static int skip_atoi(const char **s) static int skip_atoi(const char **s)
@ -85,26 +91,16 @@ static int skip_atoi(const char **s)
return i; return i;
} }
#define ZEROPAD 1 /* pad with zero */
#define SIGN 2 /* unsigned/signed long */
#define PLUS 4 /* show plus */
#define SPACE 8 /* space if plus */
#define LEFT 16 /* left justified */
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
#define ZEROTRUNC 128 /* truncate zero 's */
static int __res; static int do_div(long long *n,int base)
{
int do_div(long *n,int base) { int __res = ((unsigned long long) *n) % (unsigned) base;
*n = ((unsigned long long) *n) / (unsigned) base;
__res = ((unsigned long) *n) % (unsigned) base; return __res;
*n = ((unsigned long) *n) / (unsigned) base;
return __res;
} }
static char * number(FILE * f, long num, int base, int size, int precision
,int type) static void number(FILE * f, long long num, int base, int size, int precision ,int type)
{ {
char c,sign,tmp[66]; char c,sign,tmp[66];
const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
@ -115,7 +111,7 @@ static char * number(FILE * f, long num, int base, int size, int precision
if (type & LEFT) if (type & LEFT)
type &= ~ZEROPAD; type &= ~ZEROPAD;
if (base < 2 || base > 36) if (base < 2 || base > 36)
return 0; return;
c = (type & ZEROPAD) ? '0' : ' '; c = (type & ZEROPAD) ? '0' : ' ';
sign = 0; sign = 0;
if (type & SIGN) { if (type & SIGN) {
@ -147,36 +143,33 @@ static char * number(FILE * f, long num, int base, int size, int precision
size -= precision; size -= precision;
if (!(type&(ZEROPAD+LEFT))) if (!(type&(ZEROPAD+LEFT)))
while(size-->0) while(size-->0)
putc( ' ',f); putc(' ',f);
if (sign) if (sign)
putc( sign,f); putc(sign,f);
if (type & SPECIAL) { if (type & SPECIAL) {
if (base==8) { if (base==8) {
putc( '0',f); putc('0',f);
} }
else if (base==16) { else if (base==16) {
putc( '0', f); putc('0', f);
putc( digits[33],f); putc(digits[33],f);
} }
} }
if (!(type & LEFT)) if (!(type & LEFT))
while (size-- > 0) while (size-- > 0)
putc( c,f); putc(c,f);
while (i < precision--) while (i < precision--)
putc( '0', f); putc('0', f);
while (i-- > 0) while (i-- > 0)
putc( tmp[i],f); putc(tmp[i],f);
while (size-- > 0) while (size-- > 0)
putc( ' ', f); putc(' ', f);
__res = 0; return;
return 0;
} }
void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int type) void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int type)
{ {
double exponent = 0.0; double exponent = 0.0;
double e; double e;
long ie; long ie;
@ -195,7 +188,6 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
double_t *n = (double_t *)&__n; double_t *n = (double_t *)&__n;
if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
ie = ((unsigned int)n->exponent - (unsigned int)0x3ff); ie = ((unsigned int)n->exponent - (unsigned int)0x3ff);
exponent = ie/3.321928; exponent = ie/3.321928;
@ -205,7 +197,6 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
type |= ZEROTRUNC; type |= ZEROTRUNC;
if ( exponent < -4 || fabs(exponent) >= precision ) if ( exponent < -4 || fabs(exponent) >= precision )
exp_sign -= 2; // g -> e and G -> E exp_sign -= 2; // g -> e and G -> E
} }
if ( exp_sign == 'e' || exp_sign == 'E' ) { if ( exp_sign == 'e' || exp_sign == 'E' ) {
@ -215,8 +206,6 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
else if ( frac < -0.5 ) else if ( frac < -0.5 )
e--; e--;
numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type); numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type);
putc( exp_sign,f); putc( exp_sign,f);
size--; size--;
@ -229,9 +218,7 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
return; return;
} }
if ( exp_sign == 'f' ) { if ( exp_sign == 'f' ) {
buf = alloca(4096); buf = alloca(4096);
if (type & LEFT) { if (type & LEFT) {
type &= ~ZEROPAD; type &= ~ZEROPAD;
@ -253,20 +240,12 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
} }
} }
frac = modf(__n,&intr); frac = modf(__n,&intr);
// # flags forces a . and prevents trucation of trailing zero's // # flags forces a . and prevents trucation of trailing zero's
if ( precision > 0 ) { if ( precision > 0 ) {
//frac = modfl(__n,&intr); //frac = modfl(__n,&intr);
i = precision-1; i = precision-1;
while ( i >= 0 ) { while ( i >= 0 ) {
frac*=10.0L; frac*=10.0L;
@ -288,17 +267,12 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
} }
} }
if ( intr == 0.0 ) { if ( intr == 0.0 ) {
buf[i++] = '0'; buf[i++] = '0';
size--; size--;
} }
else { else {
while ( intr > 0.0 ) { while ( intr > 0.0 ) {
intr/=10.0L; intr/=10.0L;
p = modf(intr, &intr); p = modf(intr, &intr);
@ -307,10 +281,8 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
buf[i++] = (int)p + '0'; buf[i++] = (int)p + '0';
size--; size--;
} }
} }
j = 0; j = 0;
while ( j < i && ro == 1) { while ( j < i && ro == 1) {
if ( buf[j] >= '0' && buf[j] <= '8' ) { if ( buf[j] >= '0' && buf[j] <= '8' ) {
@ -330,19 +302,19 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
size -= precision; size -= precision;
if (!(type&(ZEROPAD+LEFT))) if (!(type&(ZEROPAD+LEFT)))
while(size-->0) while(size-->0)
putc( ' ',f); putc(' ',f);
if (sign) if (sign)
putc( sign,f); putc( sign,f);
if (!(type&(ZEROPAD+LEFT))) if (!(type&(ZEROPAD+LEFT)))
while(size-->0) while(size-->0)
putc( ' ',f); putc(' ',f);
if (type & SPECIAL) { if (type & SPECIAL) {
} }
if (!(type & LEFT)) if (!(type & LEFT))
while (size-- > 0) while (size-- > 0)
putc( c,f); putc(c,f);
tmp = buf; tmp = buf;
if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) {
@ -351,27 +323,20 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
tmp++; tmp++;
i--; i--;
} }
} }
// else // else
// while (i < precision--) // while (i < precision--)
// putc( '0', f); // putc('0', f);
while (i-- > 0) while (i-- > 0)
putc( tmp[i],f); putc(tmp[i],f);
while (size-- > 0) while (size-- > 0)
putc( ' ', f); putc(' ', f);
} }
} }
void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision, int type) void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision, int type)
{ {
long double exponent = 0.0; long double exponent = 0.0;
long double e; long double e;
long ie; long ie;
@ -390,7 +355,6 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
long_double_t *n = (long_double_t *)&__n; long_double_t *n = (long_double_t *)&__n;
if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
ie = ((unsigned int)n->exponent - (unsigned int)0x3fff); ie = ((unsigned int)n->exponent - (unsigned int)0x3fff);
exponent = ie/3.321928; exponent = ie/3.321928;
@ -400,7 +364,6 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
type |= ZEROTRUNC; type |= ZEROTRUNC;
if ( exponent < -4 || fabs(exponent) >= precision ) if ( exponent < -4 || fabs(exponent) >= precision )
exp_sign -= 2; // g -> e and G -> E exp_sign -= 2; // g -> e and G -> E
} }
if ( exp_sign == 'e' || exp_sign == 'E' ) { if ( exp_sign == 'e' || exp_sign == 'E' ) {
@ -410,8 +373,6 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
else if ( frac < -0.5 ) else if ( frac < -0.5 )
e--; e--;
numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type); numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type);
putc( exp_sign,f); putc( exp_sign,f);
size--; size--;
@ -424,7 +385,6 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
return; return;
} }
if ( exp_sign == 'f' ) { if ( exp_sign == 'f' ) {
buf = alloca(4096); buf = alloca(4096);
@ -448,18 +408,10 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
} }
} }
frac = modfl(__n,&intr); frac = modfl(__n,&intr);
// # flags forces a . and prevents trucation of trailing zero's // # flags forces a . and prevents trucation of trailing zero's
if ( precision > 0 ) { if ( precision > 0 ) {
//frac = modfl(__n,&intr); //frac = modfl(__n,&intr);
i = precision-1; i = precision-1;
@ -483,17 +435,12 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
} }
} }
if ( intr == 0.0 ) { if ( intr == 0.0 ) {
buf[i++] = '0'; buf[i++] = '0';
size--; size--;
} }
else { else {
while ( intr > 0.0 ) { while ( intr > 0.0 ) {
intr/=10.0L; intr/=10.0L;
p = modfl(intr, &intr); p = modfl(intr, &intr);
@ -502,10 +449,8 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
buf[i++] = (int)p + '0'; buf[i++] = (int)p + '0';
size--; size--;
} }
} }
j = 0; j = 0;
while ( j < i && ro == 1) { while ( j < i && ro == 1) {
if ( buf[j] >= '0' && buf[j] <= '8' ) { if ( buf[j] >= '0' && buf[j] <= '8' ) {
@ -525,19 +470,19 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
size -= precision; size -= precision;
if (!(type&(ZEROPAD+LEFT))) if (!(type&(ZEROPAD+LEFT)))
while(size-->0) while(size-->0)
putc( ' ',f); putc(' ',f);
if (sign) if (sign)
putc( sign,f); putc(sign,f);
if (!(type&(ZEROPAD+LEFT))) if (!(type&(ZEROPAD+LEFT)))
while(size-->0) while(size-->0)
putc( ' ',f); putc(' ',f);
if (type & SPECIAL) { if (type & SPECIAL) {
} }
if (!(type & LEFT)) if (!(type & LEFT))
while (size-- > 0) while (size-- > 0)
putc( c,f); putc(c,f);
tmp = buf; tmp = buf;
if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) {
@ -546,29 +491,22 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
tmp++; tmp++;
i--; i--;
} }
} }
// else // else
// while (i < precision--) // while (i < precision--)
// putc( '0', f); // putc( '0', f);
while (i-- > 0) while (i-- > 0)
putc( tmp[i],f); putc(tmp[i],f);
while (size-- > 0) while (size-- > 0)
putc( ' ', f); putc(' ', f);
} }
} }
int
__vfprintf(FILE *f, const char *fmt, va_list args) int __vfprintf(FILE *f, const char *fmt, va_list args)
{ {
int len; int len;
unsigned long num; unsigned long long num;
int i, base; int i, base;
long double _ldouble; long double _ldouble;
double _double; double _double;
@ -580,7 +518,7 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
int field_width; /* width of output field */ int field_width; /* width of output field */
int precision; /* min. # of digits for integers; max int precision; /* min. # of digits for integers; max
number of chars for from string */ number of chars for from string */
int qualifier = 0; /* 'h', 'l', or 'L' for integer fields */ int qualifier = 0; /* 'h', 'l', 'L' or 'I64' for integer fields */
for (; *fmt ; ++fmt) { for (; *fmt ; ++fmt) {
if (*fmt != '%') { if (*fmt != '%') {
@ -646,10 +584,12 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
default: default:
break; break;
} }
} } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ) {
else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ) {
qualifier = *fmt; qualifier = *fmt;
++fmt; ++fmt;
} else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') {
qualifier = *fmt;
fmt += 3;
} }
// go fine with ll instead of L // go fine with ll instead of L
@ -668,38 +608,34 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
putc(' ',f); putc(' ',f);
putc((unsigned char) va_arg(args, int),f); putc((unsigned char) va_arg(args, int),f);
while (--field_width > 0) while (--field_width > 0)
putc( ' ',f); putc(' ',f);
continue; continue;
case 'S': case 'S':
case 'w': case 'w':
sw = va_arg(args,short int *); sw = va_arg(args,short int *);
// DPRINT("L %x\n",sw); // DPRINT("L %x\n",sw);
if (sw==NULL) if (sw==NULL) {
{
// CHECKPOINT; // CHECKPOINT;
s = "<NULL>"; s = "<NULL>";
while ((*s)!=0) while ((*s)!=0) {
{ putc(*s++,f);
putc( *s++,f);
} }
// CHECKPOINT; // CHECKPOINT;
// DbgPrint("str %x\n",str); // DbgPrint("str %x\n",str);
} } else {
else while ((*sw)!=0) {
{ putc((char)(*sw++),f);
while ((*sw)!=0)
{
putc( (char)(*sw++),f);
} }
} }
// CHECKPOINT; // CHECKPOINT;
continue; continue;
case 'e': case 'e':
case 'E': case 'E':
case 'f': case 'f':
case 'g': case 'g':
case 'G': case 'G':
if (qualifier == 'l' || qualifier == 'L' ) { if (qualifier == 'l' || qualifier == 'L' ) {
_ldouble = va_arg(args, long double); _ldouble = va_arg(args, long double);
@ -710,7 +646,6 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
putc(*s++,f); putc(*s++,f);
len --; len --;
} }
} }
else if ( _isinfl(_ldouble) < 0 ) { else if ( _isinfl(_ldouble) < 0 ) {
s = "-Inf"; s = "-Inf";
@ -727,15 +662,12 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
putc(*s++,f); putc(*s++,f);
len --; len --;
} }
} } else {
else {
if ( precision == -1 ) if ( precision == -1 )
precision = 6; precision = 6;
numberfl(f,_ldouble,*fmt,field_width,precision,flags); numberfl(f,_ldouble,*fmt,field_width,precision,flags);
} }
} } else {
else {
_double = (double)va_arg(args, double); _double = (double)va_arg(args, double);
if ( _isnan(_double) ) { if ( _isnan(_double) ) {
@ -745,47 +677,44 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
putc(*s++,f); putc(*s++,f);
len --; len --;
} }
} else if ( _isinf(_double) < 0 ) {
}
else if ( _isinf(_double) < 0 ) {
s = "-Inf"; s = "-Inf";
len = 4; len = 4;
while ( len > 0 ) { while ( len > 0 ) {
putc(*s++,f); putc(*s++,f);
len --; len --;
} }
} } else if ( _isinf(_double) > 0 ) {
else if ( _isinf(_double) > 0 ) {
s = "+Inf"; s = "+Inf";
len = 4; len = 4;
while ( len > 0 ) { while ( len > 0 ) {
putc(*s++,f); putc(*s++,f);
len --; len --;
} }
} } else {
else {
if ( precision == -1 ) if ( precision == -1 )
precision = 6; precision = 6;
numberf(f,_double,*fmt,field_width,precision,flags); numberf(f,_double,*fmt,field_width,precision,flags);
} }
} }
continue; continue;
case 's': case 's':
s = va_arg(args, char *); s = va_arg(args, char *);
if (!s) if (!s)
s = "<NULL>"; s = "<NULL>";
len = strnlen(s, precision); len = strlen(s);
if ((unsigned int)len > (unsigned int)precision)
len = precision;
if (!(flags & LEFT)) if (!(flags & LEFT))
while (len < field_width--) while (len < field_width--)
putc( ' ', f); putc(' ', f);
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
putc( *s++,f); putc(*s++,f);
while (len < field_width--) while (len < field_width--)
putc( ' ', f); putc(' ', f);
continue; continue;
case 'p': case 'p':
@ -798,7 +727,6 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
field_width, precision, flags); field_width, precision, flags);
continue; continue;
case 'n': case 'n':
if (qualifier == 'l') { if (qualifier == 'l') {
long * ip = va_arg(args, long *); long * ip = va_arg(args, long *);
@ -832,14 +760,17 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
default: default:
if (*fmt != '%') if (*fmt != '%')
putc( '%', f); putc('%', f);
if (*fmt) if (*fmt)
putc( *fmt, f); putc(*fmt, f);
else else
--fmt; --fmt;
continue; continue;
} }
if (qualifier == 'l')
if (qualifier == 'I')
num = va_arg(args, unsigned long long);
else if (qualifier == 'l')
num = va_arg(args, unsigned long); num = va_arg(args, unsigned long);
else if (qualifier == 'h') { else if (qualifier == 'h') {
if (flags & SIGN) if (flags & SIGN)
@ -857,15 +788,4 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
return 0; return 0;
} }
/* EOF */