fix %lf, etc. with printf

[musl] / src / stdio / vfprintf.c

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 8cbfd96..928c8c1 100644 (file)
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -73,6 +73,8 @@ static const unsigned char states[]['z'-'A'+1] = {
        }, { /* 1: l-prefixed */
                S('d') = LONG, S('i') = LONG,
                S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG,
+               S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL,
+               S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL,
                S('c') = INT, S('s') = PTR, S('n') = PTR,
                S('l') = LLPRE,
        }, { /* 2: ll-prefixed */
@@ -193,7 +195,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
        uint32_t *a, *d, *r, *z;
        int e2=0, e, i, j, l;
        char buf[9+LDBL_MANT_DIG/4], *s;
-       const char *prefix="-+ ";
+       const char *prefix="-0X+0X 0X-0x+0x 0x";
        int pl;
        char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
 
@@ -201,10 +203,10 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
        if (y<0 || 1/y<0) {
                y=-y;
        } else if (fl & MARK_POS) {
-               prefix++;
+               prefix+=3;
        } else if (fl & PAD_POS) {
-               prefix+=2;
-       } else pl=0;
+               prefix+=6;
+       } else prefix++, pl=0;
 
        if (!isfinite(y)) {
                char *s = (t&32)?"inf":"INF";
@@ -223,15 +225,23 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                long double round = 8.0;
                int re;
 
+               if (t&32) prefix += 9;
+               pl += 2;
+
                if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
                else re=LDBL_MANT_DIG/4-1-p;
 
                if (re) {
-                       if (pl && *prefix=='-') y=-y;
                        while (re--) round*=16;
-                       y+=round;
-                       y-=round;
-                       if (y<0) y=-y;
+                       if (*prefix=='-') {
+                               y=-y;
+                               y-=round;
+                               y+=round;
+                               y=-y;
+                       } else {
+                               y+=round;
+                               y-=round;
+                       }
                }
 
                estr=fmt_u(e2<0 ? -e2 : e2, ebuf);
@@ -240,17 +250,17 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                *--estr = t+('p'-'a');
 
                s=buf;
-               *s++='0';
-               *s++=t+('x'-'a');
                do {
                        int x=y;
                        *s++=xdigits[x]|(t&32);
                        y=16*(y-x);
-                       if (s-buf==3 && (y||p>0||(fl&ALT_FORM))) *s++='.';
+                       if (s-buf==1 && (y||p>0||(fl&ALT_FORM))) *s++='.';
                } while (y);
 
-               if (p<0) p = s-buf-4;
-               l = 1 + p + (p || (fl&ALT_FORM)) + ebuf-estr;
+               if (p && s-buf-2 < p)
+                       l = (p+2) + (ebuf-estr);
+               else
+                       l = (s-buf) + (ebuf-estr);
 
                pad(f, ' ', w, pl+l, fl);
                out(f, prefix, pl);
@@ -258,12 +268,12 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                out(f, buf, s-buf);
                pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
                out(f, estr, ebuf-estr);
-               pad(f, '0', w, pl+l, fl^LEFT_ADJ);
+               pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
                return MAX(w, pl+l);
        }
        if (p<0) p=6;
 
-       y *= 0x1p28; e2-=28;
+       if (y) y *= 0x1p28, e2-=28;
 
        if (e2<0) a=r=z=big;
        else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
@@ -305,7 +315,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
        else e=0;
 
        /* Perform rounding: j is precision after the radix (possibly neg) */
-       j = p - ((t|32)!='f')*e - ((t|32)=='g');
+       j = p - ((t|32)!='f')*e - ((t|32)=='g' && p);
        if (j < 9*(z-r-1)) {
                uint32_t x;
                /* We avoid C's broken division of negative numbers */
@@ -318,13 +328,15 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                if (x || d+1!=z) {
                        long double round = CONCAT(0x1p,LDBL_MANT_DIG);
                        long double small;
-                       if (x<i/2) small=0x01p-1;
-                       else if (i==i/2 && d+1==z) small=0x10p-1;
-                       else small=0x11p-1;
+                       if (*d/i & 1) round += 2;
+                       if (x<i/2) small=0x0.8p0;
+                       else if (x==i/2 && d+1==z) small=0x1.0p0;
+                       else small=0x1.8p0;
                        if (pl && *prefix=='-') round*=-1, small*=-1;
+                       *d -= x;
                        /* Decide whether to round by probing round+small */
                        if (round+small != round) {
-                               *d = *d - x + i;
+                               *d = *d + i;
                                while (*d > 999999999) {
                                        *d--=0;
                                        (*d)++;
@@ -333,6 +345,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                                for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
                        }
                }
+               if (z>d+1) z=d+1;
                for (; !z[-1] && z>a; z--);
        }
        
@@ -347,7 +360,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
                }
                if (!(fl&ALT_FORM)) {
                        /* Count trailing zeros in last place */
-                       if (z>a) for (i=10, j=0; z[-1]%i==0; i*=10, j++);
+                       if (z>a && z[-1]) for (i=10, j=0; z[-1]%i==0; i*=10, j++);
                        else j=9;
                        if ((t|32)=='f')
                                p = MIN(p,MAX(0,9*(z-r-1)-j));
@@ -541,7 +554,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
                        fl |= ALT_FORM;
                case 'x': case 'X':
                        a = fmt_x(arg.i, z, t&32);
-                       if (fl & ALT_FORM) prefix+=(t>>4), pl=2;
+                       if (arg.i && (fl & ALT_FORM)) prefix+=(t>>4), pl=2;
                        if (0) {
                case 'o':
                        a = fmt_o(arg.i, z);
@@ -559,8 +572,11 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
                case 'u':
                        a = fmt_u(arg.i, z);
                        }
-                       if (!arg.i && !p) continue;
                        if (p>=0) fl &= ~ZERO_PAD;
+                       if (!arg.i && !p) {
+                               a=z;
+                               break;
+                       }
                        p = MAX(p, z-a + !arg.i);
                        break;
                case 'c':
@@ -570,7 +586,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
                case 'm':
                        if (1) a = strerror(errno); else
                case 's':
-                       a = arg.p;
+                       a = arg.p ? arg.p : "(null)";
                        z = memchr(a, 0, p);
                        if (!z) z=a+p;
                        else p=z-a;
@@ -625,8 +641,8 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 int vfprintf(FILE *f, const char *fmt, va_list ap)
 {
        va_list ap2;
-       int nl_type[NL_ARGMAX] = {0};
-       union arg nl_arg[NL_ARGMAX];
+       int nl_type[NL_ARGMAX+1] = {0};
+       union arg nl_arg[NL_ARGMAX+1];
        unsigned char internal_buf[80], *saved_buf = 0;
        int ret;