Libc-1439.100.3.tar.gz

[apple/libc.git] / stdlib / OpenBSD / ecvt.c

diff --git a/stdlib/OpenBSD/ecvt.c b/stdlib/OpenBSD/ecvt.c
index 657c531808c15b43893c7ab5be6913f89400ddc9..869674e9d988bfb8b9ec853071f9030303e74bea 100644 (file)
--- a/stdlib/OpenBSD/ecvt.c
+++ b/stdlib/OpenBSD/ecvt.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: ecvt.c,v 1.3 2003/06/17 21:56:24 millert Exp $        */
+/*     $OpenBSD: ecvt.c,v 1.7 2009/10/16 12:15:03 martynas Exp $       */
 
 /*
- * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,22 +20,20 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ecvt.c,v 1.3 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
+#include <sys/cdefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 extern char *__dtoa(double, int, int, int *, int *, char **);
+extern void  __freedtoa(char *);
 static char *__cvt(double, int, int *, int *, int, int);
 
 static char *
-__cvt(double value, int ndigit, int *decpt, int *sign, int fmode, int pad)
+__cvt(double value, int ndigit, int * __restrict decpt, int * __restrict sign, int fmode, int pad)
 {
        static char *s;
-       char *p, *rve;
+       char *p, *rve, c;
        size_t siz;
 
        if (ndigit == 0) {
@@ -65,22 +63,29 @@ __cvt(double value, int ndigit, int *decpt, int *sign, int fmode, int pad)
                *rve = '\0';
        } else {
                p = __dtoa(value, fmode + 2, ndigit, decpt, sign, &rve);
+               if (p == NULL)
+                       return (NULL);
                if (*decpt == 9999) {
-                       /* Nan or Infinity */
+                       /* Infinity or Nan, convert to inf or nan like printf */
                        *decpt = 0;
-                       return(p);
+                       c = *p;
+                       __freedtoa(p);
+                       return(c == 'I' ? "inf" : "nan");
                }
-               /* make a local copy and adjust rve to be in terms of s */
+               /* Make a local copy and adjust rve to be in terms of s */
                if (pad && fmode)
                        siz += *decpt;
-               if ((s = (char *)malloc(siz)) == NULL)
+               if ((s = (char *)malloc(siz)) == NULL) {
+                       __freedtoa(p);
                        return(NULL);
+               }
                (void) strlcpy(s, p, siz);
                rve = s + (rve - p);
+               __freedtoa(p);
        }
 
-       /* Add trailing zeros (unless we got NaN or Inf) */
-       if (pad && *decpt != 9999) {
+       /* Add trailing zeros */
+       if (pad) {
                siz -= rve - s;
                while (--siz)
                        *rve++ = '0';
@@ -91,13 +96,13 @@ __cvt(double value, int ndigit, int *decpt, int *sign, int fmode, int pad)
 }
 
 char *
-ecvt(double value, int ndigit, int *decpt, int *sign)
+ecvt(double value, int ndigit, int * __restrict decpt, int * __restrict sign)
 {
        return(__cvt(value, ndigit, decpt, sign, 0, 1));
 }
 
 char *
-fcvt(double value, int ndigit, int *decpt, int *sign)
+fcvt(double value, int ndigit, int * __restrict decpt, int * __restrict sign)
 {
        return(__cvt(value, ndigit, decpt, sign, 1, 1));
 }