fix %lf, etc. with printf

[musl] / src / stdio / vfprintf.c

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index a8cf41b..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 */
@@ -326,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)++;
@@ -341,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--);
        }
        
@@ -549,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);
@@ -567,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':
@@ -578,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;