X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fc-strtod.c;h=51e996e5da0246a70f5a62ddd7f9310fd30b5798;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=0f97528a86e53ee99fe7b3849a94266ffbf5c153;hpb=39857ab5806b8ceffaf5aab75fb20a2e872268a9;p=gnulib.git

diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 0f97528a8..51e996e5d 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -24,8 +24,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdlib.h>
-
-#include "xalloc.h"
+#include <string.h>
 
 #if LONG
 # define C_STRTOD c_strtold
@@ -44,6 +43,25 @@
 # define STRTOD strtod
 #endif
 
+#ifdef LC_ALL_MASK
+
+/* 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)
 {
@@ -51,18 +69,15 @@ C_STRTOD (char const *nptr, char **endptr)
 
 #ifdef LC_ALL_MASK
 
-  locale_t c_locale;
-  int saved_errno;
-
-  c_locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-  if (!c_locale)
-    return 0; /* errno is set here */
-
-  r = STRTOD_L (nptr, endptr, c_locale);
+  locale_t locale = c_locale ();
+  if (!locale)
+    {
+      if (endptr)
+	*endptr = (char *) nptr;
+      return 0; /* errno is set here */
+    }
 
-  saved_errno = errno;
-  freelocale (c_locale);
-  errno = saved_errno;
+  r = STRTOD_L (nptr, endptr, locale);
 
 #else
 
@@ -70,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");
     }