(__getmntent_r): Don't return with locked stream.

[kopensolaris-gnu/glibc.git] / misc / efgcvt.c

diff --git a/misc/efgcvt.c b/misc/efgcvt.c
index 73be3e1..8c92766 100644 (file)
--- a/misc/efgcvt.c
+++ b/misc/efgcvt.c
@@ -1,47 +1,79 @@
-/* [efg]cvt -- compatibility functions for floating point formatting.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Compatibility functions for floating point formatting.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library 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
-Library General Public License for more details.
+   The GNU C Library 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
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <float.h>
+#include <bits/libc-lock.h>
 
 #ifndef FLOAT_TYPE
-#define FLOAT_TYPE double
-#define FUNC_PREFIX
-#define FLOAT_FMT_FLAG
-#define MAXDIG (DBL_DIG + DBL_MAX_10_EXP)
+# define FLOAT_TYPE double
+# define FUNC_PREFIX
+# define FLOAT_FMT_FLAG
+/* Actually we have to write (DBL_DIG + log10 (DBL_MAX_10_EXP)) but we
+   don't have log10 available in the preprocessor.  */
+# define MAXDIG (DBL_DIG + 3)
 #endif
 
 #define APPEND(a, b) APPEND2 (a, b)
 #define APPEND2(a, b) a##b
 
 
+#define FCVT_BUFFER APPEND (FUNC_PREFIX, fcvt_buffer)
+#define ECVT_BUFFER APPEND (FUNC_PREFIX, ecvt_buffer)
+
+
+static char *FCVT_BUFFER;
+static char *ECVT_BUFFER;
+
+
+static void
+APPEND (FUNC_PREFIX, fcvt_allocate) (void)
+{
+  FCVT_BUFFER = (char *) malloc (MAXDIG);
+}
+
 char *
 APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
      FLOAT_TYPE value;
      int ndigit, *decpt, *sign;
 {
-  static char buf[MAXDIG];
+  __libc_once_define (static, once);
+  __libc_once (once, APPEND (FUNC_PREFIX, fcvt_allocate));
 
-  (void) fcvt_r (value, ndigit, decpt, sign, buf, sizeof buf);
+  if (FCVT_BUFFER == NULL)
+    /* If no core is available we don't have a chance to run the
+       program successfully and so returning NULL is an acceptable
+       result.  */
+    return NULL;
 
-  return buf;
+  (void) APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
+                                      FCVT_BUFFER, MAXDIG);
+
+  return FCVT_BUFFER;
+}
+
+
+static void
+APPEND (FUNC_PREFIX, ecvt_allocate) (void)
+{
+  ECVT_BUFFER = (char *) malloc (MAXDIG);
 }
 
 char *
@@ -49,11 +81,19 @@ APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
      FLOAT_TYPE value;
      int ndigit, *decpt, *sign;
 {
-  static char buf[MAXDIG];
+  __libc_once_define (static, once);
+  __libc_once (once, APPEND (FUNC_PREFIX, ecvt_allocate));
 
-  (void) ecvt_r (value, ndigit, decpt, sign, buf, sizeof buf);
+  if (ECVT_BUFFER == NULL)
+    /* If no core is available we don't have a chance to run the
+       program successfully and so returning NULL is an acceptable
+       result.  */
+    return NULL;
 
-  return buf;
+  (void) APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,
+                                      ECVT_BUFFER, MAXDIG);
+
+  return ECVT_BUFFER;
 }
 
 char *
@@ -65,3 +105,18 @@ APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)
   sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", ndigit, value);
   return buf;
 }
+
+
+/* Make sure the memory is freed if the programs ends while in
+   memory-debugging mode and something actually was allocated.  */
+static void
+__attribute__ ((unused))
+free_mem (void)
+{
+  if (FCVT_BUFFER != NULL)
+    free (FCVT_BUFFER);
+  if (ECVT_BUFFER != NULL)
+    free (ECVT_BUFFER);
+}
+
+text_set_element (__libc_subfreeres, free_mem);