maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filter ANSI colors when not writing to a terminal

Browse source 
Fixes https://github.com/NixOS/nixpkgs/issues/37114.
This commit is contained in:
Eelco Dolstra 2018-03-15 16:08:07 +01:00
parent 7b8914825a
commit 4868721506
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/util.cc
View file

@ -1185,7 +1185,7 @@ void ignoreException()
}
std::string filterANSIEscapes(const std::string & s, unsigned int width)
std::string filterANSIEscapes(const std::string & s, bool filterAll, unsigned int width)
{
std::string t, e;
size_t w = 0;
@ -1210,7 +1210,7 @@ std::string filterANSIEscapes(const std::string & s, unsigned int width)
if (i != s.end() && *i >= 0x40 && *i <= 0x5f) e += *i++;
}
if (last == 'm')
if (!filterAll && last == 'm')
t += e;
}