From 8148aaf1151292a1c3285b94151fbce38cf3335e Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 28 Dec 2022 09:31:03 +0100 Subject: [PATCH] clean printf for %f --- fdprintf.c | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/fdprintf.c b/fdprintf.c index 6c06e03..76722fc 100644 --- a/fdprintf.c +++ b/fdprintf.c @@ -43,6 +43,38 @@ char *itoa (char *str, unsigned u, unsigned int sz) return s; } +double tenpower(int n) +{ + double t = 1.0; + int i; + for (i = 0; i < n; i++) { + t *= 10; + } + for (i = 0; i > n; i--) { + t /= 10; + } + return t; +} + +int getexponant (double *f, int maxexp) +{ + int exp = 0; + while (*f > 10) { + *f /= 10; + exp++; + } + while (*f < 1) { + *f *= 10; + exp--; + } + *f += tenpower (maxexp - 1); + if (*f >= 10) { + *f /= 10; + exp++; + } + + return exp; +} /* simple fprintf function */ int fdprintf (int fd, const char *fmt, ...) @@ -105,27 +137,17 @@ int fdprintf (int fd, const char *fmt, ...) *str++ = '-'; f = -f; } - t = 0; - while (f > 10) { - f /= 10; - t++; - } - while (f < 1) { - f *= 10; - t--; - } - f += 1e-7; - if (f >= 10) { - f /= 10; - t++; - } + t = getexponant (&f, -6); u = (int)f; str = itoa (str, u, 0); - d = (int)((f - u) * 1e6); + d = (int)((f - u) * tenpower (6)); if (d > 0) { *str++ = '.'; str = itoa (str, d, 6); } + while (*(str - 1) == '0') { + str--; + } if (t != 0) { *str++ = 'e'; if (t < 0) { -- 2.30.2