Ticket #2: locale.patch

gcc/gcc-4.2.1/intl/localename.c

@@ -393 +393 @@
      On some systems this can be done by the 'setlocale' function itself.  */
 # if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
   retval = setlocale (category, NULL);
+  if (retval == NULL || retval[0] == '\0')
+    retval = "C";
 # else
   /* Setting of LC_ALL overwrites all other.  */
   retval = getenv ("LC_ALL");

gcc/gcc-4.2.1/libstdc++-v3/config/locale/generic/c_locale.h

@@ -65 +65 @@
                    const char* __fmt, ...)
   {
     char* __old = std::setlocale(LC_NUMERIC, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (std::strcmp(__old, "C"))
       {

gcc/gcc-4.2.1/libstdc++-v3/config/locale/gnu/c_locale.h

@@ -82 +82 @@
     __c_locale __old = __gnu_cxx::__uselocale(__cloc);
 #else
     char* __old = std::setlocale(LC_ALL, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = new char[std::strlen(__old) + 1];
     std::strcpy(__sav, __old);
     std::setlocale(LC_ALL, "C");

gcc/gcc-4.4.0/intl/localename.c

@@ -393 +393 @@
      On some systems this can be done by the 'setlocale' function itself.  */
 # if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
   retval = setlocale (category, NULL);
+  if (retval == NULL || retval[0] == '\0')
+    retval = "C";
 # else
   /* Setting of LC_ALL overwrites all other.  */
   retval = getenv ("LC_ALL");

gcc/gcc-4.4.0/libstdc++-v3/config/locale/generic/c_locale.cc

@@ -51 +51 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __len = strlen(__old) + 1;
       char* __sav = new char[__len];
       memcpy(__sav, __old, __len);
@@ -116 +118 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __len = strlen(__old) + 1;
       char* __sav = new char[__len];
       memcpy(__sav, __old, __len);
@@ -161 +165 @@
     {
       // Assumes __s formatted for "C" locale.
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __len = strlen(__old) + 1;
       char* __sav = new char[__len];
       memcpy(__sav, __old, __len);

gcc/gcc-4.4.0/libstdc++-v3/config/locale/generic/c_locale.h

@@ -58 +58 @@
                    const char* __fmt, ...)
   {
     char* __old = std::setlocale(LC_NUMERIC, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (__builtin_strcmp(__old, "C"))
       {

gcc/gcc-4.4.0/libstdc++-v3/config/locale/generic/time_members.cc

@@ -43 +43 @@
            const tm* __tm) const
     {
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __llen = strlen(__old) + 1;
       char* __sav = new char[__llen];
       memcpy(__sav, __old, __llen);
@@ -128 +130 @@
            const tm* __tm) const
     {
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __llen = strlen(__old) + 1;
       char* __sav = new char[__llen];
       memcpy(__sav, __old, __llen);

gcc/gcc-4.4.0/libstdc++-v3/config/locale/gnu/c_locale.h

@@ -72 +72 @@
     __c_locale __old = __gnu_cxx::__uselocale(__cloc);
 #else
     char* __old = std::setlocale(LC_NUMERIC, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (__builtin_strcmp(__old, "C"))
       {

gcc/gcc-4.4.0/libstdc++-v3/config/locale/gnu/messages_members.cc

@@ -45 +45 @@
       return string(__msg);
 #else
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __len = strlen(__old) + 1;
       char* __sav = new char[__len];
       memcpy(__sav, __old, __len);
@@ -68 +70 @@
       return _M_convert_from_char(__msg);
 # else
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __len = strlen(__old) + 1;
       char* __sav = new char[__len];
       memcpy(__sav, __old, __len);

gcc/gcc-4.4.0/libstdc++-v3/config/locale/gnu/monetary_members.cc

@@ -428 +428 @@
 #else
           // Switch to named locale so that mbsrtowcs will work.
           char* __old = setlocale(LC_ALL, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
           const size_t __llen = strlen(__old) + 1;
           char* __sav = new char[__llen];
           memcpy(__sav, __old, __llen);
@@ -596 +598 @@
 #else
           // Switch to named locale so that mbsrtowcs will work.
           char* __old = setlocale(LC_ALL, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
           const size_t __llen = strlen(__old) + 1;
           char* __sav = new char[__llen];
           memcpy(__sav, __old, __llen);

gcc/gcc-4.4.0/libstdc++-v3/config/locale/gnu/time_members.cc

@@ -46 +46 @@
                                         _M_c_locale_timepunct);
 #else
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old == '\0')
+        __old = "C";
       const size_t __llen = strlen(__old) + 1;  
       char* __sav = new char[__llen];
       memcpy(__sav, __old, __llen);
@@ -202 +204 @@
                                         _M_c_locale_timepunct);
 #else
       char* __old = setlocale(LC_ALL, NULL);
+      if (__old == NULL || __old[0] == '\0')
+        __old = "C";
       const size_t __llen = strlen(__old) + 1;
       char* __sav = new char[__llen];
       memcpy(__sav, __old, __llen);

gcc/gcc-4.4.0/libstdc++-v3/config/os/gnu-linux/ctype_noninline.h

@@ -45 +45 @@
   {
     const ctype_base::mask* __ret;
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (__builtin_strcmp(__old, "C"))
       {
@@ -87 +89 @@
   _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
   {
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (__builtin_strcmp(__old, "C"))
       {    
@@ -132 +136 @@
   _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
   {
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     char* __sav = NULL;
     if (__builtin_strcmp(__old, "C"))
       {

gcc/gcc-4.4.0/libstdc++-v3/config/os/tpf/ctype_noninline.h

@@ -38 +38 @@
   {
     const ctype_base::mask* __ret;
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     const size_t __len = __builtin_strlen(__old) + 1;
     char* __sav = new char[__len];
     __builtin_memcpy(__sav, __old, __len);
@@ -53 +55 @@
   : facet(__refs), _M_del(__table != 0 && __del)
   {
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     const size_t __len = __builtin_strlen(__old) + 1;
     char* __sav = new char[__len];
     __builtin_memcpy(__sav, __old, __len);
@@ -69 +73 @@
   : facet(__refs), _M_del(__table != 0 && __del)
   {
     char* __old = setlocale(LC_CTYPE, NULL);
+    if (__old == NULL || __old[0] == '\0')
+      __old = "C";
     const size_t __len = __builtin_strlen(__old) + 1;
     char* __sav = new char[__len];
     __builtin_memcpy(__sav, __old, __len);