X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvfprintf.c;h=4c990e5e54fa730c755206a9c5a6b4c597e8b2a3;hb=13cd969552409e05c941829f2aabb15e2f4d9a1f;hp=2245d1da5dedeed4eb698098c4faaf502b6c4597;hpb=f9569662c08d371b85c77f025dd5c6e00b4a4c8b;p=musl

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 2245d1da..4c990e5e 100644
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -326,13 +326,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 +343,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 +552,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 +570,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':
@@ -633,8 +639,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;