--- gforth/engine/ecvt.c	1997/05/21 20:40:07	1.1
+++ gforth/engine/ecvt.c	2007/12/31 18:40:25	1.10
@@ -1,5 +1,24 @@
-/* cheap ecvt replacement */
+/* cheap ecvt replacement
 
+  Copyright (C) 1998,2000,2007 Free Software Foundation, Inc.
+
+  This file is part of Gforth.
+
+  Gforth is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation, either version 3
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, see http://www.gnu.org/licenses/.
+*/
+
+#include <stdio.h>
 #include "config.h"
 #include <math.h>
 extern double floor(double);
@@ -13,6 +32,20 @@ char* ecvt(double x, int len, int* exp,
    int i, j;
    double z;
    
+   if (isnan(x)) {
+     *sign=0;
+     *exp=0;
+     return "nan";
+   }
+   if (isinf(x)) {
+     *sign=0; /* this mimics the glibc ecvt */
+     *exp=0;
+     if (x<0)
+       return "-inf";
+     else
+       return "inf";
+   }
+       
    if(len > (MAXCONV-1)) len = MAXCONV-1;
    
    if(x<0)
@@ -36,6 +69,7 @@ char* ecvt(double x, int len, int* exp,
    for(i=0; i < len; i++)
      {
 	z=floor(x);
+	if(z<0) z = 0;
 	scratch[i]='0'+(char)((int)z);
 	x = (x-z)*10;
      }
@@ -53,7 +87,7 @@ char* ecvt(double x, int len, int* exp,
 		  scratch[j]='0';
 	       }
 	  }
-	if(j==0)
+	if(j<0)
 	  {
 	     scratch[0]='1';
 	     *exp += 1;
@@ -69,8 +103,9 @@ char* ecvt(double x, int len, int* exp,
 int main(int argc, char ** argv)
 {
    int a, b;
-   char * conv=ecvt(PI*1e10,20,&a,&b);
+   char * conv=ecvt(9e0,20,&a,&b);
    
-   printf("ecvt Test: %f -> %s, %d, %d\n",PI,conv,a,b);
+   printf("ecvt Test: %f -> %s, %d, %d\n",9e0,conv,a,b);
 }
 #endif
+