eric
/
libpipecolors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcprintf now returns string length without the ansi

This commit is contained in:
R. Eric Wheeler 2015-07-13 14:39:00 -07:00
parent 5645cd735f
commit d4a0670998
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libpipecolors.cpp
View File

@ -70,7 +70,7 @@ namespace pipecolors {
return isatty(fileno(stdout)); return isatty(fileno(stdout));
} }
std::string replace_colors( std::string s) { std::pair<std::string,int> replace_colors( std::string s) {
using namespace boost; using namespace boost;
@ -81,13 +81,17 @@ namespace pipecolors {
std::string::const_iterator start, end; std::string::const_iterator start, end;
start = s.begin(); start = s.begin();
end = s.end(); end = s.end();
std::string len(s);
colors = getColors(); colors = getColors();
while(regex_search(start, end, match, re, flags)) while(regex_search(start, end, match, re, flags))
{ {
if(colors[match[0]].empty() && PC_REMOVE_INVALID == false) goto skip; if(colors[match[0]].empty() && PC_REMOVE_INVALID == false) goto skip;
len.erase(len.find(match[0]), match[0].length());
if(has_colors() && !colors[match[0]].empty()) { if(has_colors() && !colors[match[0]].empty()) {
s.replace(s.find(match[0]), match[0].length(), colors[match[0]]); s.replace(s.find(match[0]), match[0].length(), colors[match[0]]);
} else { } else {
@ -98,7 +102,8 @@ namespace pipecolors {
start = match[0].second; start = match[0].second;
flags |= boost::match_prev_avail | boost::match_not_bob; flags |= boost::match_prev_avail | boost::match_not_bob;
} }
return(s); return std::make_pair(s, len.length());
} }
int pcprintf( const char * fmt, ...) int pcprintf( const char * fmt, ...)
@ -118,9 +123,10 @@ namespace pipecolors {
std::string s(buffer); std::string s(buffer);
free(buffer); free(buffer);
std::cout << replace_colors(s); std::pair<std::string, int> result = replace_colors(s);
std::cout << result.first;
return(ret); return(result.second);
} }
} // namespace } // namespace