yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc	2007-08-03 20:30:53.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.cc	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -46,16 +46,13 @@
yann@313:      __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
yann@313:  		   const __c_locale& __cloc)
yann@313:      {
yann@313: -      if (!(__err & ios_base::failbit))
yann@313: -	{
yann@313: -	  char* __sanity;
yann@313: -	  errno = 0;
yann@313: -	  float __f = __strtof_l(__s, &__sanity, __cloc);
yann@313: -          if (__sanity != __s && errno != ERANGE)
yann@313: -	    __v = __f;
yann@313: -	  else
yann@313: -	    __err |= ios_base::failbit;
yann@313: -	}
yann@313: +      char* __sanity;
yann@313: +      errno = 0;
yann@313: +      float __f = __strtof_l(__s, &__sanity, __cloc);
yann@313: +      if (__sanity != __s && errno != ERANGE)
yann@313: +	__v = __f;
yann@313: +      else
yann@313: +	__err |= ios_base::failbit;
yann@313:      }
yann@313:  
yann@313:    template<>
yann@313: @@ -63,16 +60,13 @@
yann@313:      __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
yann@313:  		   const __c_locale& __cloc)
yann@313:      {
yann@313: -      if (!(__err & ios_base::failbit))
yann@313: -	{
yann@313: -	  char* __sanity;
yann@313: -	  errno = 0;
yann@313: -	  double __d = __strtod_l(__s, &__sanity, __cloc);
yann@313: -          if (__sanity != __s && errno != ERANGE)
yann@313: -	    __v = __d;
yann@313: -	  else
yann@313: -	    __err |= ios_base::failbit;
yann@313: -	}
yann@313: +      char* __sanity;
yann@313: +      errno = 0;
yann@313: +      double __d = __strtod_l(__s, &__sanity, __cloc);
yann@313: +      if (__sanity != __s && errno != ERANGE)
yann@313: +	__v = __d;
yann@313: +      else
yann@313: +	__err |= ios_base::failbit;
yann@313:      }
yann@313:  
yann@313:    template<>
yann@313: @@ -80,16 +74,13 @@
yann@313:      __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
yann@313:  		   const __c_locale& __cloc)
yann@313:      {
yann@313: -      if (!(__err & ios_base::failbit))
yann@313: -	{
yann@313: -	  char* __sanity;
yann@313: -	  errno = 0;
yann@313: -	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
yann@313: -          if (__sanity != __s && errno != ERANGE)
yann@313: -	    __v = __ld;
yann@313: -	  else
yann@313: -	    __err |= ios_base::failbit;
yann@313: -	}
yann@313: +      char* __sanity;
yann@313: +      errno = 0;
yann@313: +      long double __ld = __strtold_l(__s, &__sanity, __cloc);
yann@313: +      if (__sanity != __s && errno != ERANGE)
yann@313: +	__v = __ld;
yann@313: +      else
yann@313: +	__err |= ios_base::failbit;
yann@313:      }
yann@313:  
yann@313:    void
yann@313: @@ -110,7 +101,7 @@
yann@313:    void
yann@313:    locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
yann@313:    {
yann@313: -    if (_S_get_c_locale() != __cloc)
yann@313: +    if (__cloc && _S_get_c_locale() != __cloc)
yann@313:        __freelocale(__cloc); 
yann@313:    }
yann@313:  
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h	2007-08-03 20:30:53.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/c_locale.h	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -39,21 +39,23 @@
yann@313:  #pragma GCC system_header
yann@313:  
yann@313:  #include <cstring>              // get std::strlen
yann@313: -#include <cstdio>               // get std::snprintf or std::sprintf
yann@313: +#include <cstdio>               // get std::vsnprintf or std::vsprintf
yann@313:  #include <clocale>
yann@313:  #include <langinfo.h>		// For codecvt
yann@313:  #ifdef __UCLIBC_MJN3_ONLY__
yann@313:  #warning fix this
yann@313:  #endif
yann@313: -#ifdef __UCLIBC_HAS_LOCALE__
yann@313: +#ifdef _GLIBCXX_USE_ICONV
yann@313:  #include <iconv.h>		// For codecvt using iconv, iconv_t
yann@313:  #endif
yann@313: -#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@313: -#include <libintl.h> 		// For messages
yann@313: +#ifdef HAVE_LIBINTL_H
yann@313: +#include <libintl.h>		// For messages
yann@313:  #endif
yann@313: +#include <cstdarg>
yann@313:  
yann@313:  #ifdef __UCLIBC_MJN3_ONLY__
yann@313:  #warning what is _GLIBCXX_C_LOCALE_GNU for
yann@313: +// psm: used in os/gnu-linux/ctype_noninline.h
yann@313:  #endif
yann@313:  #define _GLIBCXX_C_LOCALE_GNU 1
yann@313:  
yann@313: @@ -62,7 +64,7 @@
yann@313:  #endif
yann@313:  // #define _GLIBCXX_NUM_CATEGORIES 6
yann@313:  #define _GLIBCXX_NUM_CATEGORIES 0
yann@313: - 
yann@313: +
yann@313:  #ifdef __UCLIBC_HAS_XLOCALE__
yann@313:  namespace __gnu_cxx
yann@313:  {
yann@313: @@ -79,22 +81,24 @@
yann@313:    typedef int*			__c_locale;
yann@313:  #endif
yann@313:  
yann@313: -  // Convert numeric value of type _Tv to string and return length of
yann@313: -  // string.  If snprintf is available use it, otherwise fall back to
yann@313: -  // the unsafe sprintf which, in general, can be dangerous and should
yann@313: +  // Convert numeric value of type double to string and return length of
yann@313: +  // string.  If vsnprintf is available use it, otherwise fall back to
yann@313: +  // the unsafe vsprintf which, in general, can be dangerous and should
yann@313:    // be avoided.
yann@313: -  template<typename _Tv>
yann@313: -    int
yann@313: -    __convert_from_v(char* __out, 
yann@313: -		     const int __size __attribute__ ((__unused__)),
yann@313: -		     const char* __fmt,
yann@313: -#ifdef __UCLIBC_HAS_XCLOCALE__
yann@313: -		     _Tv __v, const __c_locale& __cloc, int __prec)
yann@313: +    inline int
yann@313: +    __convert_from_v(const __c_locale&
yann@313: +#ifndef __UCLIBC_HAS_XCLOCALE__
yann@313: +					__cloc __attribute__ ((__unused__))
yann@313: +#endif
yann@313: +		     ,
yann@313: +		     char* __out,
yann@313: +		     const int __size,
yann@313: +		     const char* __fmt, ...)
yann@313:      {
yann@313: +      va_list __args;
yann@313: +#ifdef __UCLIBC_HAS_XCLOCALE__
yann@313:        __c_locale __old = __gnu_cxx::__uselocale(__cloc);
yann@313:  #else
yann@313: -		     _Tv __v, const __c_locale&, int __prec)
yann@313: -    {
yann@313:  # ifdef __UCLIBC_HAS_LOCALE__
yann@313:        char* __old = std::setlocale(LC_ALL, NULL);
yann@313:        char* __sav = new char[std::strlen(__old) + 1];
yann@313: @@ -103,7 +107,9 @@
yann@313:  # endif
yann@313:  #endif
yann@313:  
yann@313: -      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
yann@313: +      va_start(__args, __fmt);
yann@313: +      const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
yann@313: +      va_end(__args);
yann@313:  
yann@313:  #ifdef __UCLIBC_HAS_XCLOCALE__
yann@313:        __gnu_cxx::__uselocale(__old);
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2007-08-03 20:30:53.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -33,9 +33,14 @@
yann@313:  
yann@313:  // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@313:  
yann@313: +#include <features.h>
yann@313: +#ifdef __UCLIBC_HAS_LOCALE__
yann@313:  #define _LIBC
yann@313:  #include <locale>
yann@313:  #undef _LIBC
yann@313: +#else
yann@313: +#include <locale>
yann@313: +#endif
yann@313:  #include <bits/c++locale_internal.h>
yann@313:  
yann@313:  namespace std
yann@313: @@ -138,20 +143,34 @@
yann@313:    ctype<wchar_t>::
yann@313:    do_is(mask __m, wchar_t __c) const
yann@313:    { 
yann@313: -    // Highest bitmask in ctype_base == 10, but extra in "C"
yann@313: -    // library for blank.
yann@313: +    // The case of __m == ctype_base::space is particularly important,
yann@313: +    // due to its use in many istream functions.  Therefore we deal with
yann@313: +    // it first, exploiting the knowledge that on GNU systems _M_bit[5]
yann@313: +    // is the mask corresponding to ctype_base::space.  NB: an encoding
yann@313: +    // change would not affect correctness!
yann@313:      bool __ret = false;
yann@313: -    const size_t __bitmasksize = 11; 
yann@313: -    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
yann@313: -      if (__m & _M_bit[__bitcur]
yann@313: -	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
yann@313: -	{
yann@313: -	  __ret = true;
yann@313: -	  break;
yann@313: -	}
yann@313: +    if (__m == _M_bit[5])
yann@313: +      __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
yann@313: +    else
yann@313: +      {
yann@313: +	// Highest bitmask in ctype_base == 10, but extra in "C"
yann@313: +	// library for blank.
yann@313: +	const size_t __bitmasksize = 11;
yann@313: +	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
yann@313: +	  if (__m & _M_bit[__bitcur])
yann@313: +	    {
yann@313: +	      if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
yann@313: +		{
yann@313: +		  __ret = true;
yann@313: +		  break;
yann@313: +		}
yann@313: +	      else if (__m == _M_bit[__bitcur])
yann@313: +		break;
yann@313: +	    }
yann@313: +      }
yann@313:      return __ret;    
yann@313:    }
yann@313: -  
yann@313: +
yann@313:    const wchar_t* 
yann@313:    ctype<wchar_t>::
yann@313:    do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:30:53.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/messages_members.h	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -47,18 +47,21 @@
yann@313:    template<typename _CharT>
yann@313:       messages<_CharT>::messages(size_t __refs)
yann@313:       : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 
yann@313: -     _M_name_messages(_S_get_c_name())
yann@313: +       _M_name_messages(_S_get_c_name())
yann@313:       { }
yann@313:  
yann@313:    template<typename _CharT>
yann@313:       messages<_CharT>::messages(__c_locale __cloc, const char* __s, 
yann@313:  				size_t __refs) 
yann@313: -     : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
yann@313: -     _M_name_messages(__s)
yann@313: +     : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
yann@313:       {
yann@313: -       char* __tmp = new char[std::strlen(__s) + 1];
yann@313: -       std::strcpy(__tmp, __s);
yann@313: +       const size_t __len = std::strlen(__s) + 1;
yann@313: +       char* __tmp = new char[__len];
yann@313: +       std::memcpy(__tmp, __s, __len);
yann@313:         _M_name_messages = __tmp;
yann@313: +
yann@313: +       // Last to avoid leaking memory if new throws.
yann@313: +       _M_c_locale_messages = _S_clone_c_locale(__cloc);
yann@313:       }
yann@313:  
yann@313:    template<typename _CharT>
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:31:24.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -33,9 +33,14 @@
yann@313:  
yann@313:  // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@313:  
yann@313: +#include <features.h>
yann@313: +#ifdef __UCLIBC_HAS_LOCALE__
yann@313:  #define _LIBC
yann@313:  #include <locale>
yann@313:  #undef _LIBC
yann@313: +#else
yann@313: +#include <locale>
yann@313: +#endif
yann@313:  #include <bits/c++locale_internal.h>
yann@313:  
yann@313:  #ifdef __UCLIBC_MJN3_ONLY__
yann@313: @@ -206,7 +211,7 @@
yann@313:  	  }
yann@313:  	break;
yann@313:        default:
yann@313: -	;
yann@313: +	__ret = pattern();
yann@313:        }
yann@313:      return __ret;
yann@313:    }
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:31:24.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -33,9 +33,14 @@
yann@313:  
yann@313:  // Written by Benjamin Kosnik <bkoz@redhat.com>
yann@313:  
yann@313: +#include <features.h>
yann@313: +#ifdef __UCLIBC_HAS_LOCALE__
yann@313:  #define _LIBC
yann@313:  #include <locale>
yann@313:  #undef _LIBC
yann@313: +#else
yann@313: +#include <locale>
yann@313: +#endif
yann@313:  #include <bits/c++locale_internal.h>
yann@313:  
yann@313:  #ifdef __UCLIBC_MJN3_ONLY__
yann@313: diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h
yann@313: --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:30:21.000000000 +0200
yann@313: +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/time_members.h	2007-08-03 20:31:54.000000000 +0200
yann@313: @@ -37,25 +37,33 @@
yann@313:    template<typename _CharT>
yann@313:      __timepunct<_CharT>::__timepunct(size_t __refs) 
yann@313:      : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@313: -    _M_name_timepunct(_S_get_c_name())
yann@313: +      _M_name_timepunct(_S_get_c_name())
yann@313:      { _M_initialize_timepunct(); }
yann@313:  
yann@313:    template<typename _CharT>
yann@313:      __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
yann@313:      : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), 
yann@313: -    _M_name_timepunct(_S_get_c_name())
yann@313: +      _M_name_timepunct(_S_get_c_name())
yann@313:      { _M_initialize_timepunct(); }
yann@313:  
yann@313:    template<typename _CharT>
yann@313:      __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
yann@313:  				     size_t __refs) 
yann@313:      : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
yann@313: -    _M_name_timepunct(__s)
yann@313: +      _M_name_timepunct(NULL)
yann@313:      { 
yann@313: -      char* __tmp = new char[std::strlen(__s) + 1];
yann@313: -      std::strcpy(__tmp, __s);
yann@313: +      const size_t __len = std::strlen(__s) + 1;
yann@313: +      char* __tmp = new char[__len];
yann@313: +      std::memcpy(__tmp, __s, __len);
yann@313:        _M_name_timepunct = __tmp;
yann@313: -      _M_initialize_timepunct(__cloc); 
yann@313: +
yann@313: +      try
yann@313: +	{ _M_initialize_timepunct(__cloc); }
yann@313: +      catch(...)
yann@313: +	{
yann@313: +	  delete [] _M_name_timepunct;
yann@313: +	  __throw_exception_again;
yann@313: +	}
yann@313:      }
yann@313:  
yann@313:    template<typename _CharT>