X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c096ba5ea1c7536e00d8eb6bcad3f0a4a6edb13e..65546961ea3aa545db6f77fc73b3aa6623ab8b0d:/src/common/string.cpp?ds=sidebyside diff --git a/src/common/string.cpp b/src/common/string.cpp index f6b388e45b..1c8fadcb69 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1,11 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: string.cpp // Purpose: wxString class -// Author: Vadim Zeitlin +// Author: Vadim Zeitlin, Ryan Norton // Modified by: // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin +// (c) 2004 Ryan Norton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -984,126 +985,6 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen, // wxString class core // =========================================================================== -// --------------------------------------------------------------------------- -// common conversion routines -// --------------------------------------------------------------------------- - -size_t wxString::WorstEncodingCase(size_t len, const wxMBConv& WXUNUSED(conv)) -{ - //Worst case for UTF7 - return len * 5; -} - -#if wxUSE_WCHAR_T - -//Convert a wide character string of a specified length -//to a multi-byte character string, ignoring intermittent null characters -//returns the actual length of the string -inline size_t wxMbstr(char* szBuffer, const wchar_t* szString, - size_t nStringLen, wxMBConv& conv) -{ - const wchar_t* szEnd = szString + nStringLen + 1; - const wchar_t* szPos = szString; - const wchar_t* szStart = szPos; - - size_t nActualLength = 0; - - //Convert the string until the length() is reached, continuing the - //loop every time a null character is reached - while(szPos != szEnd) - { - wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true - - //Get the length of the current (sub)string - size_t nLen = conv.WC2MB(NULL, szPos, 0); - - //Invalid conversion? - if( nLen == (size_t)-1 ) - { - szBuffer[0] = '\0'; - return 0; - } - - //Increase the actual length (+1 for current null character) - nActualLength += nLen + 1; - - //If this is true it means buffer overflow - wxASSERT( nActualLength <= wxString::WorstEncodingCase(nStringLen, conv) + 1 ); - - //Convert the current (sub)string - if(conv.WC2MB(&szBuffer[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) - { - //error - return empty buffer - wxFAIL_MSG(wxT("Error converting wide-character string to a multi-byte string")); - szBuffer[0] = '\0'; - return 0; - } - - //Increment to next (sub)string - //Note that we have to use wxWcslen here instead of nLen - //here because XX2XX gives us the size of the output buffer, - //not neccessarly the length of the string - szPos += wxWcslen(szPos) + 1; - } - - return nActualLength - 1; //success - return actual length -} - -//Convert a multi-byte character string of a specified length -//to a wide character string, ignoring intermittent null characters -//returns the actual length -inline size_t wxWcstr( wchar_t* szBuffer, const char* szString, - size_t nStringLen, wxMBConv& conv) -{ - const char* szEnd = szString + nStringLen + 1; - const char* szPos = szString; - const char* szStart = szPos; - - size_t nActualLength = 0; - - //Convert the string until the length() is reached, continuing the - //loop every time a null character is reached - while(szPos != szEnd) - { - wxASSERT(szPos < szEnd); //something is _really_ screwed up if this rings true - - //Get the length of the current (sub)string - size_t nLen = conv.MB2WC(NULL, szPos, 0); - - //Invalid conversion? - if( nLen == (size_t)-1 ) - { - szBuffer[0] = '\0'; - return 0; - } - - //Increase the actual length (+1 for current null character) - nActualLength += nLen + 1; - - //If this is true it means buffer overflow - wxASSERT(nActualLength <= nStringLen + 1); - - //Convert the current (sub)string - if ( conv.MB2WC(&szBuffer[szPos - szStart], szPos, nLen + 1) == (size_t)-1 ) - { - //error - return empty buffer - wxFAIL_MSG(wxT("Error converting multi-byte string to a wide-character string")); - szBuffer[0] = '\0'; - return 0; - } - - //Increment to next (sub)string - //Note that we have to use strlen here instead of nLen - //here because XX2XX gives us the size of the output buffer, - //not neccessarly the length of the string - szPos += strlen(szPos) + 1; - } - - return nActualLength - 1; //success - return actual length -} - -#endif //wxUSE_WCHAR_T - // --------------------------------------------------------------------------- // construction and conversion // --------------------------------------------------------------------------- @@ -1143,29 +1024,25 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength) nLen = 0; } + // anything to do? if ( (nLen != 0) && (nLen != (size_t)-1) ) { - //When converting mb->wc it never inflates to more characters than the length - wxStringBufferLength internalBuffer(*this, nLen + 1); + //Convert string + size_t nRealSize; + wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize); - //Do the actual conversion & Set the length of the buffer - internalBuffer.SetLength( - wxWcstr(internalBuffer, psz, nLen, conv) - ); + //Copy + if (nRealSize) + assign( theBuffer.data() , nRealSize - 1 ); } } //Convert wxString in Unicode mode to a multi-byte string const wxCharBuffer wxString::mb_str(wxMBConv& conv) const { - //Create the buffer - wxCharBuffer buffer( wxString::WorstEncodingCase(length(), conv) + 1); - - //Do the actual conversion (will return a blank string on error) - wxMbstr(buffer.data(), (*this).c_str(), length(), conv); - - return buffer; + size_t dwOutSize; + return conv.cWC2MB(c_str(), length(), &dwOutSize); } #else // ANSI @@ -1207,14 +1084,13 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) // anything to do? if ( (nLen != 0) && (nLen != (size_t)-1) ) { - //Create a wxStringBufferLength which will access the internal - //C char pointer in non-stl mode - wxStringBufferLength internalBuffer(*this, wxString::WorstEncodingCase(nLen, conv) + 1); + //Convert string + size_t nRealSize; + wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize); - //Do the actual conversion & Set the length of the buffer - internalBuffer.SetLength( - wxMbstr(internalBuffer, pwz, nLen, conv) - ); + //Copy + if (nRealSize) + assign( theBuffer.data() , nRealSize - 1 ); } } @@ -1222,13 +1098,8 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength) //mode is not enabled and wxUSE_WCHAR_T is enabled const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const { - //mb->wc never inflates to more than the length - wxWCharBuffer buffer(length() + 1); - - //Do the actual conversion (will return a blank string on error) - wxWcstr(buffer.data(), (*this).c_str(), length(), conv); - - return buffer; + size_t dwOutSize; + return conv.cMB2WC(c_str(), length(), &dwOutSize); } #endif // wxUSE_WCHAR_T @@ -1404,7 +1275,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1, if(wxTolower(s1[i]) != wxTolower(s2[i])) break; } - return i == l1 ? 0 : s1[i] < s2[i] ? -1 : 1; + return i == l1 ? 0 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1; } else if( l1 < l2 ) { @@ -1413,7 +1284,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1, if(wxTolower(s1[i]) != wxTolower(s2[i])) break; } - return i == l1 ? -1 : s1[i] < s2[i] ? -1 : 1; + return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1; } else if( l1 > l2 ) { @@ -1422,7 +1293,7 @@ static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1, if(wxTolower(s1[i]) != wxTolower(s2[i])) break; } - return i == l2 ? 1 : s1[i] < s2[i] ? -1 : 1; + return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1; } wxFAIL; // must never get there @@ -1489,12 +1360,13 @@ const wxCharBuffer wxString::ToAscii() const // this will allocate enough space for the terminating NUL too wxCharBuffer buffer(length()); - signed char *dest = (signed char *)buffer.data(); + + char *dest = buffer.data(); const wchar_t *pwc = c_str(); for ( ;; ) { - *dest++ = *pwc > SCHAR_MAX ? wxT('_') : *pwc; + *dest++ = (char)(*pwc > SCHAR_MAX ? wxT('_') : *pwc); // the output string can't have embedded NULs anyhow, so we can safely // stop at first of them even if we do have any