Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a variant of wcs2string which accepts a ptr, length pair

Browse source 
This will be useful when refactoring separated buffers.
This commit is contained in:
ridiculousfish 2021-02-04 13:28:48 -08:00
parent 86a12e1abd
commit fc97151aec
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common.cpp
View file

@ -406,10 +406,12 @@ wcstring str2wcstring(const std::string &in, size_t len) {
return str2wcs_internal(in.data(), len); return str2wcs_internal(in.data(), len);
} }
std::string wcs2string(const wcstring &input) { std::string wcs2string(const wcstring &input) { return wcs2string(input.data(), input.size()); }
std::string wcs2string(const wchar_t *in, size_t len) {
std::string result; std::string result;
result.reserve(input.size()); result.reserve(len);
wcs2string_callback(input.data(), input.size(), [&](const char *buff, size_t bufflen) { wcs2string_callback(in, len, [&](const char *buff, size_t bufflen) {
result.append(buff, bufflen); result.append(buff, bufflen);
return true; return true;
}); });

1
src/common.h
View file

@ -291,6 +291,7 @@ wcstring str2wcstring(const std::string &in, size_t len);
/// This function decodes illegal character sequences in a reversible way using the private use /// This function decodes illegal character sequences in a reversible way using the private use
/// area. /// area.
std::string wcs2string(const wcstring &input); std::string wcs2string(const wcstring &input);
std::string wcs2string(const wchar_t *in, size_t len);
// Check if we are running in the test mode, where we should suppress error output // Check if we are running in the test mode, where we should suppress error output
#define TESTS_PROGRAM_NAME L"(ignore)" #define TESTS_PROGRAM_NAME L"(ignore)"