X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fc-strtod.c;h=a5973d477e27795162241a233aae3ef9f1e007d6;hb=55b49420fc3ae8860ed66a85645b2b4d171646dc;hp=031f5f877b8fa86fac17bbefcb7ced7312633b9e;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git
diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 031f5f877..a5973d477 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -1,11 +1,11 @@
/* Convert string to double, using the C locale.
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003-2004, 2006, 2009-2012 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program 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 2, or (at your option)
- any later version.
+ 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
@@ -13,21 +13,18 @@
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, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "c-strtod.h"
+#include
#include
#include
-
-#include "xalloc.h"
+#include
#if LONG
# define C_STRTOD c_strtold
@@ -46,16 +43,41 @@
# define STRTOD strtod
#endif
+#if defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
+
+/* Cache for the C locale object.
+ Marked volatile so that different threads see the same value
+ (avoids locking). */
+static volatile locale_t c_locale_cache;
+
+/* Return the C locale object, or (locale_t) 0 with errno set
+ if it cannot be created. */
+static inline locale_t
+c_locale (void)
+{
+ if (!c_locale_cache)
+ c_locale_cache = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
+ return c_locale_cache;
+}
+
+#endif
+
DOUBLE
C_STRTOD (char const *nptr, char **endptr)
{
DOUBLE r;
-#ifdef LC_ALL_MASK
+#if defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
+
+ locale_t locale = c_locale ();
+ if (!locale)
+ {
+ if (endptr)
+ *endptr = (char *) nptr;
+ return 0; /* errno is set here */
+ }
- locale_t c_locale = newlocale (LC_ALL_MASK, "C", 0);
- r = STRTOD_L (nptr, endptr, c_locale);
- freelocale (c_locale);
+ r = STRTOD_L (nptr, endptr, locale);
#else
@@ -63,7 +85,13 @@ C_STRTOD (char const *nptr, char **endptr)
if (saved_locale)
{
- saved_locale = xstrdup (saved_locale);
+ saved_locale = strdup (saved_locale);
+ if (saved_locale == NULL)
+ {
+ if (endptr)
+ *endptr = (char *) nptr;
+ return 0; /* errno is set here */
+ }
setlocale (LC_NUMERIC, "C");
}
@@ -71,8 +99,11 @@ C_STRTOD (char const *nptr, char **endptr)
if (saved_locale)
{
+ int saved_errno = errno;
+
setlocale (LC_NUMERIC, saved_locale);
free (saved_locale);
+ errno = saved_errno;
}
#endif