projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix sigsetjmp on arm (needs asm)
[musl]
/
src
/
stdio
/
vfprintf.c
diff --git
a/src/stdio/vfprintf.c
b/src/stdio/vfprintf.c
index
a8cf41b
..
116e1ce
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,
}, { /* 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 */
S('c') = INT, S('s') = PTR, S('n') = PTR,
S('l') = LLPRE,
}, { /* 2: ll-prefixed */
@@
-294,7
+296,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
e2-=sh;
}
while (e2<0) {
e2-=sh;
}
while (e2<0) {
- uint32_t carry=0, *
z2
;
+ uint32_t carry=0, *
b
;
int sh=MIN(9,-e2);
for (d=a; d<z; d++) {
uint32_t rm = *d & (1<<sh)-1;
int sh=MIN(9,-e2);
for (d=a; d<z; d++) {
uint32_t rm = *d & (1<<sh)-1;
@@
-304,8
+306,8
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
if (!*a) a++;
if (carry) *z++ = carry;
/* Avoid (slow!) computation past requested precision */
if (!*a) a++;
if (carry) *z++ = carry;
/* Avoid (slow!) computation past requested precision */
-
z2 = ((t|32)=='f' ? r : a) + 2 + p/9
;
-
z = MIN(z, z2)
;
+
b = (t|32)=='f' ? r : a
;
+
if (z-b > 2+p/9) z = b+2+p/9
;
e2+=sh;
}
e2+=sh;
}
@@
-317,7
+319,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
if (j < 9*(z-r-1)) {
uint32_t x;
/* We avoid C's broken division of negative numbers */
if (j < 9*(z-r-1)) {
uint32_t x;
/* We avoid C's broken division of negative numbers */
- d = r + 1 + (
j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP
;
+ d = r + 1 + (
(j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP)
;
j += 9*LDBL_MAX_EXP;
j %= 9;
for (i=10, j++; j<9; i*=10, j++);
j += 9*LDBL_MAX_EXP;
j %= 9;
for (i=10, j++; j<9; i*=10, j++);
@@
-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 || 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;
if (pl && *prefix=='-') round*=-1, small*=-1;
+ *d -= x;
/* Decide whether to round by probing round+small */
if (round+small != round) {
/* 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)++;
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++);
}
}
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--);
}
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);
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);
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);
}
case 'u':
a = fmt_u(arg.i, z);
}
- if (!arg.i && !p) continue;
if (p>=0) fl &= ~ZERO_PAD;
if (p>=0) fl &= ~ZERO_PAD;
+ if (!arg.i && !p) {
+ a=z;
+ break;
+ }
p = MAX(p, z-a + !arg.i);
break;
case 'c':
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':
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;
z = memchr(a, 0, p);
if (!z) z=a+p;
else p=z-a;
@@
-591,12
+599,12
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
p = -1;
case 'S':
ws = arg.p;
p = -1;
case 'S':
ws = arg.p;
- for (i=
0;
*ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
+ for (i=
l=0; i<0U+p &&
*ws && (l=wctomb(mb, *ws++))>=0 && l<=0U+p-i; i+=l);
if (l<0) return -1;
p = i;
pad(f, ' ', w, p, fl);
ws = arg.p;
if (l<0) return -1;
p = i;
pad(f, ' ', w, p, fl);
ws = arg.p;
- for (i=0; *ws && i+(l=wctomb(mb, *ws++))<=p; i+=l)
+ for (i=0;
i<0U+p &&
*ws && i+(l=wctomb(mb, *ws++))<=p; i+=l)
out(f, mb, l);
pad(f, ' ', w, p, fl^LEFT_ADJ);
l = w>p ? w : p;
out(f, mb, l);
pad(f, ' ', w, p, fl^LEFT_ADJ);
l = w>p ? w : p;
@@
-644,8
+652,9
@@
int vfprintf(FILE *f, const char *fmt, va_list ap)
FLOCK(f);
if (!f->buf_size) {
saved_buf = f->buf;
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->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) {
}
ret = printf_core(f, fmt, &ap2, nl_arg, nl_type);
if (saved_buf) {