1 files changed, 16 insertions, 10 deletions

diff --git a/g_fmt.c b/g_fmt.c
index 543430a..130dcd4 100644
--- a/g_fmt.c
+++ b/g_fmt.c
@@ -26,14 +26,14 @@
 extern "C" {
 #endif
  extern char *dtoa(double, int, int, int *, int *, char **);
- extern char *g_fmt(char *, double);
+ extern int g_fmt(char *, double, int);
  extern void freedtoa(char*);
 #ifdef __cplusplus
         }
 #endif
 
- char *
-g_fmt(register char *b, double x)
+int
+fpconv_g_fmt(char *b, double x, int precision)
 {
         register int i, k;
         register char *s;
@@ -48,18 +48,21 @@ g_fmt(register char *b, double x)
                 goto done;
                 }
 #endif
-        s = s0 = dtoa(x, 0, 0, &decpt, &sign, &se);
+        s = s0 = dtoa(x, 2, precision, &decpt, &sign, &se);
         if (sign)
                 *b++ = '-';
         if (decpt == 9999) /* Infinity or Nan */ {
-                while(*b++ = *s++);
+                while((*b++ = *s++));
+                /* "b" is used to calculate the return length. Decrement to exclude the
+                 * Null terminator from the length */
+                b--;
                 goto done0;
                 }
-        if (decpt <= -4 || decpt > se - s + 5) {
+        if (decpt <= -4 || decpt > precision) {
                 *b++ = *s++;
                 if (*s) {
                         *b++ = '.';
-                        while(*b = *s++)
+                        while((*b = *s++))
                                 b++;
                         }
                 *b++ = 'e';
@@ -82,13 +85,14 @@ g_fmt(register char *b, double x)
                 *b = 0;
                 }
         else if (decpt <= 0) {
+                *b++ = '0';
                 *b++ = '.';
                 for(; decpt < 0; decpt++)
                         *b++ = '0';
-                while(*b++ = *s++);
+                while((*b++ = *s++));
                 }
         else {
-                while(*b = *s++) {
+                while((*b = *s++)) {
                         b++;
                         if (--decpt == 0 && *s)
                                 *b++ = '.';
@@ -99,6 +103,8 @@ g_fmt(register char *b, double x)
                 }
  done0:
         freedtoa(s0);
+#ifdef IGNORE_ZERO_SIGN
  done:
-        return b0;
+#endif
+        return b - b0;
         }