diff options
| author | Nobuyoshi Nakada <[email protected]> | 2017-04-23 09:10:29 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2017-04-23 09:54:20 +0900 |
| commit | 7314423bd1989199c834a1a2af01df9d7f42ff17 (patch) | |
| tree | 177f388d723656472ad0a5151b26bd4a9effb4e8 /mrbgems/mruby-sprintf/src/sprintf.c | |
| parent | 809b7ca3f4e93dc44ec4ba7d2cf3716834f25887 (diff) | |
| download | mruby-7314423bd1989199c834a1a2af01df9d7f42ff17.tar.gz mruby-7314423bd1989199c834a1a2af01df9d7f42ff17.zip | |
Fix space flag when Inf/NaN and width==3
While `"% 2f"` and `"% 4f"` result in `" Inf"` and `" Inf"`
respectively, `"% 3f"` results in `"Inf"` (no space).
Diffstat (limited to 'mrbgems/mruby-sprintf/src/sprintf.c')
| -rw-r--r-- | mrbgems/mruby-sprintf/src/sprintf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c index 3d96573a7..242b9cf3f 100644 --- a/mrbgems/mruby-sprintf/src/sprintf.c +++ b/mrbgems/mruby-sprintf/src/sprintf.c @@ -1048,7 +1048,7 @@ retry: expr = "Inf"; } need = elen; - if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS)) + if ((!isnan(fval) && fval < 0.0) || (flags & (FPLUS|FSPACE))) need++; if ((flags & FWIDTH) && need < width) need = width; @@ -1072,8 +1072,6 @@ retry: buf[blen + need - elen - 1] = '-'; else if (flags & FPLUS) buf[blen + need - elen - 1] = '+'; - else if ((flags & FSPACE) && need > width) - blen++; memcpy(&buf[blen + need - elen], expr, elen); } blen += strlen(&buf[blen]); |