zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-16 04:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from jsttzsf/bugfix/mbstowcs_deprecation

Browse Source 
Replaced mbstowcs with mbstowcs_s
This commit is contained in:
Pranav
2023-02-15 09:09:54 -06:00
committed by GitHub
parent f03feacc0b 98f6e50af9
commit 11c60675d5
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/indicators/display_width.hpp
View File

@@ -309,11 +309,25 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
} }
// convert UTF-8 string to wstring // convert UTF-8 string to wstring
static inline std::wstring utf8_decode(const std::string &s) { #ifdef _MSC_VER
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, ""); std::string curLocale = setlocale(LC_ALL, "");
const char *_Source = s.c_str(); const char* _Source = s.c_str();
size_t _Dsize = std::strlen(_Source) + 1;
wchar_t* _Dest = new wchar_t[_Dsize];
size_t _Osize;
mbstowcs_s(&_Osize, _Dest, _Dsize, _Source, _Dsize);
std::wstring result = _Dest;
delete[] _Dest;
setlocale(LC_ALL, curLocale.c_str());
return result;
}
#else
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, "");
const char* _Source = s.c_str();
size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1; size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
wchar_t *_Dest = new wchar_t[_Dsize]; wchar_t* _Dest = new wchar_t[_Dsize];
wmemset(_Dest, 0, _Dsize); wmemset(_Dest, 0, _Dsize);
mbstowcs(_Dest, _Source, _Dsize); mbstowcs(_Dest, _Source, _Dsize);
std::wstring result = _Dest; std::wstring result = _Dest;
@@ -321,6 +335,7 @@ static inline std::wstring utf8_decode(const std::string &s) {
setlocale(LC_ALL, curLocale.c_str()); setlocale(LC_ALL, curLocale.c_str());
return result; return result;
} }
#endif
} // namespace details } // namespace details