From 7314423bd1989199c834a1a2af01df9d7f42ff17 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 23 Apr 2017 09:10:29 +0900 Subject: 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). --- mrbgems/mruby-sprintf/src/sprintf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'mrbgems/mruby-sprintf/src/sprintf.c') 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]); -- cgit v1.2.3