Improve error handling of c_strtod.

diff --git a/ChangeLog b/ChangeLog
index 4dd6650ec7bfe40a812e7f12ed0899b321e73150..5dd2451dad95adb4d921849b2ebaf699dc71288c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-21  Bruno Haible  <bruno@clisp.org>
+
+       * lib/c-strtod.c: Include errno.h.
+       (C_STRTOD): Check against NULL return from newlocale. Preserve errno
+       value from STRTOD_L and STRTOD.
+
 2009-01-21  Bruno Haible  <bruno@clisp.org>
        and Jim Meyering  <meyering@redhat.com>
 

diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index 95624ccc1ebb726a7ad110f4c734bbfd97d3e1af..0f97528a86e53ee99fe7b3849a94266ffbf5c153 100644 (file)
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -1,6 +1,6 @@
 /* Convert string to double, using the C locale.
 
-   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006, 2009 Free Software Foundation, Inc.
 
    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
@@ -21,6 +21,7 @@
 
 #include "c-strtod.h"
 
+#include <errno.h>
 #include <locale.h>
 #include <stdlib.h>
 
@@ -50,9 +51,18 @@ C_STRTOD (char const *nptr, char **endptr)
 
 #ifdef LC_ALL_MASK
 
-  locale_t c_locale = newlocale (LC_ALL_MASK, "C", 0);
+  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);
+
+  saved_errno = errno;
   freelocale (c_locale);
+  errno = saved_errno;
 
 #else
 
@@ -68,8 +78,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