X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fconfig%2Flocale%2Fgeneric%2Fcodecvt_members.cc;h=b68e18aaf541e5c736108c50fd4288c0b9a5973f;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=814b8a2874de11c0b8348607f7b1faeb9c80b3b6;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc index 814b8a28..b68e18aa 100644 --- a/libstdc++-v3/config/locale/generic/codecvt_members.cc +++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc @@ -1,11 +1,12 @@ // std::codecvt implementation details, generic version -*- C++ -*- -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library 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) +// Free Software Foundation; either version 3, or (at your option) // any later version. // This library is distributed in the hope that it will be useful, @@ -13,19 +14,14 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . // // ISO C++ 14882: 22.2.1.5 - Template class codecvt @@ -34,12 +30,14 @@ // Written by Benjamin Kosnik #include -#include "c++locale_internal.h" +#include // For MB_CUR_MAX +#include // For MB_LEN_MAX +#include + +_GLIBCXX_BEGIN_NAMESPACE(std) -namespace std -{ // Specializations. -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T codecvt_base::result codecvt:: do_out(state_type& __state, const intern_type* __from, @@ -47,25 +45,61 @@ namespace std extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const { - result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); - size_t __conv = wcsrtombs(__to, &__from, __len, &__state); + result __ret = ok; + // The conversion must be done using a temporary destination buffer + // since it is not possible to pass the size of the buffer to wcrtomb + state_type __tmp_state(__state); - if (__conv == __len) - { - __from_next = __from; - __to_next = __to + __conv; - __ret = ok; - } - else if (__conv > 0 && __conv < __len) + // The conversion must be done by calling wcrtomb in a loop rather + // than using wcsrtombs because wcsrtombs assumes that the input is + // zero-terminated. + + // Either we can upper bound the total number of external characters to + // something smaller than __to_end - __to or the conversion must be done + // using a temporary destination buffer since it is not possible to + // pass the size of the buffer to wcrtomb + if (MB_CUR_MAX * (__from_end - __from) - (__to_end - __to) <= 0) + while (__from < __from_end) + { + const size_t __conv = wcrtomb(__to, *__from, &__tmp_state); + if (__conv == static_cast(-1)) + { + __ret = error; + break; + } + __state = __tmp_state; + __to += __conv; + __from++; + } + else { - __from_next = __from; - __to_next = __to + __conv; - __ret = partial; + extern_type __buf[MB_LEN_MAX]; + while (__from < __from_end && __to < __to_end) + { + const size_t __conv = wcrtomb(__buf, *__from, &__tmp_state); + if (__conv == static_cast(-1)) + { + __ret = error; + break; + } + else if (__conv > static_cast(__to_end - __to)) + { + __ret = partial; + break; + } + + memcpy(__to, __buf, __conv); + __state = __tmp_state; + __to += __conv; + __from++; + } } - else - __ret = error; - + + if (__ret == ok && __from < __from_end) + __ret = partial; + + __from_next = __from; + __to_next = __to; return __ret; } @@ -76,26 +110,108 @@ namespace std intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const { - result __ret = error; - size_t __len = min(__from_end - __from, __to_end - __to); - size_t __conv = mbsrtowcs(__to, &__from, __len, &__state); + result __ret = ok; + // This temporary state object is neccessary so __state won't be modified + // if [__from, __from_end) is a partial multibyte character. + state_type __tmp_state(__state); - if (__conv == __len) + // Conversion must be done by calling mbrtowc in a loop rather than + // by calling mbsrtowcs because mbsrtowcs assumes that the input + // sequence is zero-terminated. + while (__from < __from_end && __to < __to_end) { - __from_next = __from; - __to_next = __to + __conv; - __ret = ok; + size_t __conv = mbrtowc(__to, __from, __from_end - __from, + &__tmp_state); + if (__conv == static_cast(-1)) + { + __ret = error; + break; + } + else if (__conv == static_cast(-2)) + { + // It is unclear what to return in this case (see DR 382). + __ret = partial; + break; + } + else if (__conv == 0) + { + // XXX Probably wrong for stateful encodings + __conv = 1; + *__to = L'\0'; + } + + __state = __tmp_state; + __to++; + __from += __conv; } - else if (__conv > 0 && __conv < __len) + + // It is not clear that __from < __from_end implies __ret != ok + // (see DR 382). + if (__ret == ok && __from < __from_end) + __ret = partial; + + __from_next = __from; + __to_next = __to; + return __ret; + } + + int + codecvt:: + do_encoding() const throw() + { + // XXX This implementation assumes that the encoding is + // stateless and is either single-byte or variable-width. + int __ret = 0; + if (MB_CUR_MAX == 1) + __ret = 1; + return __ret; + } + + int + codecvt:: + do_max_length() const throw() + { + // XXX Probably wrong for stateful encodings. + int __ret = MB_CUR_MAX; + return __ret; + } + + int + codecvt:: + do_length(state_type& __state, const extern_type* __from, + const extern_type* __end, size_t __max) const + { + int __ret = 0; + state_type __tmp_state(__state); + + while (__from < __end && __max) { - __from_next = __from; - __to_next = __to + __conv; - __ret = partial; + size_t __conv = mbrtowc(NULL, __from, __end - __from, &__tmp_state); + if (__conv == static_cast(-1)) + { + // Invalid source character + break; + } + else if (__conv == static_cast(-2)) + { + // Remainder of input does not form a complete destination + // character. + break; + } + else if (__conv == 0) + { + // XXX Probably wrong for stateful encodings + __conv = 1; + } + + __state = __tmp_state; + __from += __conv; + __ret += __conv; + __max--; } - else - __ret = error; - + return __ret; } #endif -} + +_GLIBCXX_END_NAMESPACE