diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:20 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:20 +0000 |
| commit | 789215941b3ad3c61c5de57c38f81c91d8e3a02e (patch) | |
| tree | 19cc5dc0a5292ee2c273785e4dfcd33f1d4bdcbe /missing | |
| parent | d9f4570bddeb4d21e30936991adbc6e9d079ae4e (diff) | |
merges r20911 and 20921 from trunk into ruby_1_9_1.
* missing/vsnprintf.c (BSD_vfprintf): fix for test_sprintf_comb.rb, by
wanabe in [ruby-dev:36935].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
| -rw-r--r-- | missing/vsnprintf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c index c4326b4634..1ea2f143c2 100644 --- a/missing/vsnprintf.c +++ b/missing/vsnprintf.c @@ -753,6 +753,8 @@ reswitch: switch (ch) { #ifdef FLOATING_POINT case 'e': /* anomalous precision */ case 'E': + if (prec != 0) + flags |= ALT; prec = (prec == -1) ? DEFPREC + 1 : prec + 1; /* FALLTHROUGH */ @@ -782,7 +784,7 @@ fp_begin: _double = va_arg(ap, double); cp = cvt(_double, prec, flags, &softsign, &expt, ch, &ndig); if (ch == 'g' || ch == 'G') { - if (expt <= -4 || expt > prec) + if (expt <= -4 || (expt > prec && expt > 1)) ch = (ch == 'g') ? 'e' : 'E'; else ch = 'g'; @@ -798,6 +800,8 @@ fp_begin: _double = va_arg(ap, double); size = expt; if (prec || flags & ALT) size += prec + 1; + } else if (!prec) { /* "0" */ + size = 1; } else /* "0.X" */ size = prec + 2; } else if (expt >= ndig) { /* fixed g fmt */ @@ -1008,13 +1012,15 @@ number: if ((dprec = prec) >= 0) if (ch >= 'f') { /* 'f' or 'g' */ if (_double == 0) { /* kludge for __dtoa irregularity */ - if (prec == 0 || + if (ndig <= 1 && (flags & ALT) == 0) { PRINT("0", 1); } else { PRINT("0.", 2); PAD(ndig - 1, zeroes); } + } else if (expt == 0 && ndig == 0 && (flags & ALT) == 0) { + PRINT("0", 1); } else if (expt <= 0) { PRINT("0.", 2); PAD(-expt, zeroes); |