X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Fvfprintf.c;h=91c6b93abd50d049f8edeaba0aa88187c1d9df6c;hb=58aa5f45ed3282751ae118c107ff008d4df765dc;hp=f13fbe10576d157684ecfc9d4e8bcf448010cd6d;hpb=8628eff9128d66cc69dbc301341dc55130a9817e;p=musl

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index f13fbe10..91c6b93a 100644
--- 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 */
@@ -552,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);
@@ -570,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':
@@ -581,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;
@@ -647,8 +652,9 @@ int vfprintf(FILE *f, const char *fmt, va_list ap)
 	FLOCK(f);
 	if (!f->buf_size) {
 		saved_buf = f->buf;
-		f->buf = internal_buf;
+		f->wpos = f->wbase = f->buf = internal_buf;
 		f->buf_size = sizeof internal_buf;
+		f->wend = internal_buf + sizeof internal_buf;
 	}
 	ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
 	if (saved_buf) {