Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

574
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,28 +188,24 @@ 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;
} }
if ( exp_sign == 'g' || exp_sign == 'G' ) { if ( exp_sign == 'g' || exp_sign == 'G' ) {
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' ) {
frac = modf(exponent,&e); frac = modf(exponent,&e);
if ( frac > 0.5 ) if ( frac > 0.5 )
e++; e++;
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--;
@ -227,48 +216,38 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
number(f,ie, 10,2, 2,type ); number(f,ie, 10,2, 2,type );
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;
}
c = (type & ZEROPAD) ? '0' : ' ';
sign = 0;
if (type & SIGN) {
if (__n < 0) {
sign = '-';
__n = fabs(__n);
size--;
} else if (type & PLUS) {
sign = '+';
size--;
} else if (type & SPACE) {
sign = ' ';
size--;
}
} }
c = (type & ZEROPAD) ? '0' : ' ';
sign = 0;
if (type & SIGN) {
if (__n < 0) {
sign = '-';
__n = fabs(__n);
size--;
} else if (type & PLUS) {
sign = '+';
size--;
} else if (type & SPACE) {
sign = ' ';
size--;
}
}
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;
frac = modf(frac, &p); frac = modf(frac, &p);
buf[i] = (int)p + '0'; buf[i] = (int)p + '0';
@ -288,29 +267,22 @@ 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);
p *=10; p *=10;
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' ) {
@ -318,31 +290,31 @@ void numberf(FILE * f, double __n, char exp_sign, int size, int precision, int
ro = 0; ro = 0;
} }
else if ( buf[j] == '9' ) { else if ( buf[j] == '9' ) {
buf[j] = '0'; buf[j] = '0';
} }
j++; j++;
} }
if ( ro == 1 ) if ( ro == 1 )
buf[i++] = '1'; buf[i++] = '1';
buf[i] = 0; buf[i] = 0;
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,28 +355,24 @@ 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;
} }
if ( exp_sign == 'g' || exp_sign == 'G' ) { if ( exp_sign == 'g' || exp_sign == 'G' ) {
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' ) {
frac = modfl(exponent,&e); frac = modfl(exponent,&e);
if ( frac > 0.5 ) if ( frac > 0.5 )
e++; e++;
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--;
@ -422,48 +383,39 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
number(f,ie, 10,2, 2,type ); number(f,ie, 10,2, 2,type );
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;
}
c = (type & ZEROPAD) ? '0' : ' ';
sign = 0;
if (type & SIGN) {
if (__n < 0) {
sign = '-';
__n = fabs(__n);
size--;
} else if (type & PLUS) {
sign = '+';
size--;
} else if (type & SPACE) {
sign = ' ';
size--;
}
} }
c = (type & ZEROPAD) ? '0' : ' ';
sign = 0;
if (type & SIGN) {
if (__n < 0) {
sign = '-';
__n = fabs(__n);
size--;
} else if (type & PLUS) {
sign = '+';
size--;
} else if (type & SPACE) {
sign = ' ';
size--;
}
}
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;
while ( i >= 0 ) { while ( i >= 0 ) {
frac*=10.0L; frac*=10.0L;
frac = modfl((long double)frac, &p); frac = modfl((long double)frac, &p);
buf[i] = (int)p + '0'; buf[i] = (int)p + '0';
@ -483,29 +435,22 @@ 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);
p *=10; p *=10;
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' ) {
@ -513,81 +458,74 @@ void numberfl(FILE * f, long double __n, char exp_sign, int size, int precision
ro = 0; ro = 0;
} }
else if ( buf[j] == '9' ) { else if ( buf[j] == '9' ) {
buf[j] = '0'; buf[j] = '0';
} }
j++; j++;
} }
if ( ro == 1 ) if ( ro == 1 )
buf[i++] = '1'; buf[i++] = '1';
buf[i] = 0; buf[i] = 0;
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) ) {
j = 0; j = 0;
while ( j < i && ( *tmp == '0' || *tmp == '.' )) { while ( j < i && ( *tmp == '0' || *tmp == '.' )) {
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;
const char *s; const char *s;
const short int* sw; const short int* sw;
int flags; /* flags to number() */ int flags; /* flags to number() */
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 != '%') {
putc(*fmt,f); putc(*fmt,f);
continue; continue;
} }
/* process flags */ /* process flags */
flags = 0; flags = 0;
repeat: repeat:
@ -599,7 +537,7 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
case '#': flags |= SPECIAL; goto repeat; case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat; case '0': flags |= ZEROPAD; goto repeat;
} }
/* get field width */ /* get field width */
field_width = -1; field_width = -1;
if (isdigit(*fmt)) if (isdigit(*fmt))
@ -617,7 +555,7 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
/* get the precision */ /* get the precision */
precision = -1; precision = -1;
if (*fmt == '.') { if (*fmt == '.') {
++fmt; ++fmt;
if (isdigit(*fmt)) if (isdigit(*fmt))
precision = skip_atoi(&fmt); precision = skip_atoi(&fmt);
else if (*fmt == '*') { else if (*fmt == '*') {
@ -646,16 +584,18 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
default: default:
break; break;
} }
} else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ) {
qualifier = *fmt;
++fmt;
} else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') {
qualifier = *fmt;
fmt += 3;
} }
else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ) {
qualifier = *fmt;
++fmt;
}
// go fine with ll instead of L // go fine with ll instead of L
if ( *fmt == 'l' ) { if ( *fmt == 'l' ) {
++fmt; ++fmt;
qualifier = 'L'; qualifier = 'L';
} }
/* default base */ /* default base */
@ -668,124 +608,113 @@ __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 'w': case 'S':
sw = va_arg(args,short int *); case 'w':
// DPRINT("L %x\n",sw); sw = va_arg(args,short int *);
if (sw==NULL) // DPRINT("L %x\n",sw);
{ if (sw==NULL) {
// CHECKPOINT;
s = "<NULL>";
while ((*s)!=0) {
putc(*s++,f);
}
// CHECKPOINT;
// DbgPrint("str %x\n",str);
} else {
while ((*sw)!=0) {
putc((char)(*sw++),f);
}
}
// CHECKPOINT; // CHECKPOINT;
s = "<NULL>"; continue;
while ((*s)!=0)
{ case 'e':
putc( *s++,f); case 'E':
}
// CHECKPOINT;
// DbgPrint("str %x\n",str);
}
else
{
while ((*sw)!=0)
{
putc( (char)(*sw++),f);
}
}
// CHECKPOINT;
continue;
case 'e':
case 'E':
case 'f': case 'f':
case 'g': case 'g':
case 'G': case 'G':
if (qualifier == 'l' || qualifier == 'L' ) {
_ldouble = va_arg(args, long double);
if ( _isnanl(_ldouble) ) {
s = "Nan";
len = 3;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else if ( _isinfl(_ldouble) < 0 ) {
s = "-Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else if ( _isinfl(_ldouble) > 0 ) {
s = "+Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
} else {
if ( precision == -1 )
precision = 6;
numberfl(f,_ldouble,*fmt,field_width,precision,flags);
}
} else {
_double = (double)va_arg(args, double);
if (qualifier == 'l' || qualifier == 'L' ) { if ( _isnan(_double) ) {
_ldouble = va_arg(args, long double); s = "Nan";
len = 3;
if ( _isnanl(_ldouble) ) { while ( len > 0 ) {
s = "Nan"; putc(*s++,f);
len = 3; len --;
while ( len > 0 ) { }
putc(*s++,f); } else if ( _isinf(_double) < 0 ) {
len --; s = "-Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
} else if ( _isinf(_double) > 0 ) {
s = "+Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
} else {
if ( precision == -1 )
precision = 6;
numberf(f,_double,*fmt,field_width,precision,flags);
} }
}
} continue;
else if ( _isinfl(_ldouble) < 0 ) {
s = "-Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else if ( _isinfl(_ldouble) > 0 ) {
s = "+Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else {
if ( precision == -1 )
precision = 6;
numberfl(f,_ldouble,*fmt,field_width,precision,flags);
}
}
else {
_double = (double)va_arg(args, double);
if ( _isnan(_double) ) {
s = "Nan";
len = 3;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else if ( _isinf(_double) < 0 ) {
s = "-Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else if ( _isinf(_double) > 0 ) {
s = "+Inf";
len = 4;
while ( len > 0 ) {
putc(*s++,f);
len --;
}
}
else {
if ( precision == -1 )
precision = 6;
numberf(f,_double,*fmt,field_width,precision,flags);
}
}
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 *);
@ -813,11 +741,11 @@ __vfprintf(FILE *f, const char *fmt, va_list args)
case 'o': case 'o':
base = 8; base = 8;
break; break;
case 'b': case 'b':
base = 2; base = 2;
break; break;
case 'X': case 'X':
flags |= LARGE; flags |= LARGE;
case 'x': case 'x':
@ -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 */