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

Merge pull request #129 from zhangxianbing/master

Browse Source 
Fix setlocale usage in utf8_decode function
This commit is contained in:
Pranav
2023-11-21 05:38:11 -06:00
committed by GitHub
parent ef71abd9bc 68d059d6d2
commit 222382c3a6
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/indicators/display_width.hpp
View File

@@ -311,7 +311,10 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
// convert UTF-8 string to wstring
#ifdef _MSC_VER
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, "");
auto r = setlocale(LC_ALL, "");
std::string curLocale;
if (r)
curLocale = r;
const char* _Source = s.c_str();
size_t _Dsize = std::strlen(_Source) + 1;
wchar_t* _Dest = new wchar_t[_Dsize];
@@ -324,7 +327,10 @@ static inline std::wstring utf8_decode(const std::string& s) {
}
#else
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, "");
auto r = setlocale(LC_ALL, "");
std::string curLocale;
if (r)
curLocale = r;
const char* _Source = s.c_str();
size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
wchar_t* _Dest = new wchar_t[_Dsize];

10
single_include/indicators/indicators.hpp
View File

@@ -1652,7 +1652,10 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
// convert UTF-8 string to wstring
#ifdef _MSC_VER
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, "");
auto r = setlocale(LC_ALL, "");
std::string curLocale;
if (r)
curLocale = r;
const char* _Source = s.c_str();
size_t _Dsize = std::strlen(_Source) + 1;
wchar_t* _Dest = new wchar_t[_Dsize];
@@ -1665,7 +1668,10 @@ static inline std::wstring utf8_decode(const std::string& s) {
}
#else
static inline std::wstring utf8_decode(const std::string& s) {
std::string curLocale = setlocale(LC_ALL, "");
auto r = setlocale(LC_ALL, "");
std::string curLocale;
if (r)
curLocale = r;
const char* _Source = s.c_str();
size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
wchar_t* _Dest = new wchar_t[_Dsize];