projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
math: fix pow(0,-inf) to raise divbyzero flag
[musl]
/
src
/
stdio
/
vfprintf.c
diff --git
a/src/stdio/vfprintf.c
b/src/stdio/vfprintf.c
index
4c990e5
..
a2b287b
100644
(file)
--- a/
src/stdio/vfprintf.c
+++ b/
src/stdio/vfprintf.c
@@
-1,4
+1,13
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <errno.h>
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <inttypes.h>
+#include <math.h>
+#include <float.h>
/* Some useful macros */
/* Some useful macros */
@@
-73,6
+82,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 */
@@
-187,6
+198,13
@@
static char *fmt_u(uintmax_t x, char *s)
return s;
}
return s;
}
+/* Do not override this check. The floating point printing code below
+ * depends on the float.h constants being right. If they are wrong, it
+ * may overflow the stack. */
+#if LDBL_MANT_DIG == 53
+typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)];
+#endif
+
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
{
uint32_t big[(LDBL_MAX_EXP+LDBL_MANT_DIG)/9+1];
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
{
uint32_t big[(LDBL_MAX_EXP+LDBL_MANT_DIG)/9+1];
@@
-198,7
+216,7
@@
static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
pl=1;
char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
pl=1;
- if (
y<0 || 1/y<0
) {
+ if (
signbit(y)
) {
y=-y;
} else if (fl & MARK_POS) {
prefix+=3;
y=-y;
} else if (fl & MARK_POS) {
prefix+=3;
@@
-294,7
+312,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
+322,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
+335,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++);
@@
-428,7
+446,7
@@
static int getint(char **s) {
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type)
{
char *a, *z, *s=(char *)fmt;
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type)
{
char *a, *z, *s=(char *)fmt;
- unsigned l10n=0,
litpct,
fl;
+ unsigned l10n=0, fl;
int w, p;
union arg arg;
int argpos;
int w, p;
union arg arg;
int argpos;
@@
-453,9
+471,7
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
/* Handle literal text and %% format specifiers */
for (a=s; *s && *s!='%'; s++);
/* Handle literal text and %% format specifiers */
for (a=s; *s && *s!='%'; s++);
- litpct = strspn(s, "%")/2; /* Optimize %%%% runs */
- z = s+litpct;
- s += 2*litpct;
+ for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2);
l = z-a;
if (f) out(f, a, l);
if (l) continue;
l = z-a;
if (f) out(f, a, l);
if (l) continue;
@@
-584,7
+600,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;
@@
-597,12
+613,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;
@@
-636,7
+652,7
@@
static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
return 1;
}
return 1;
}
-int vfprintf(FILE *
f, const char *
fmt, va_list ap)
+int vfprintf(FILE *
restrict f, const char *restrict
fmt, va_list ap)
{
va_list ap2;
int nl_type[NL_ARGMAX+1] = {0};
{
va_list ap2;
int nl_type[NL_ARGMAX+1] = {0};
@@
-650,8
+666,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) {