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

Fix set_color crash on 'ignore' and 'reset'

Browse source 
https://github.com/fish-shell/fish-shell/issues/996
This commit is contained in:
ridiculousfish 2013-09-21 15:15:06 -07:00
parent fdef82f89c
commit 73f1030bde
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
builtin_set_color.cpp
View file

@ -152,14 +152,14 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv)
} }
const rgb_color_t fg = rgb_color_t(fgcolor ? fgcolor : L""); const rgb_color_t fg = rgb_color_t(fgcolor ? fgcolor : L"");
if (fgcolor && fg.is_none()) if (fgcolor && (fg.is_none() || fg.is_ignore()))
{ {
append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], fgcolor); append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], fgcolor);
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
const rgb_color_t bg = rgb_color_t(bgcolor ? bgcolor : L""); const rgb_color_t bg = rgb_color_t(bgcolor ? bgcolor : L"");
if (bgcolor && bg.is_none()) if (bgcolor && (bg.is_none() || bg.is_ignore()))
{ {
append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], bgcolor); append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], bgcolor);
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
@ -212,7 +212,7 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv)
if (fgcolor != NULL) if (fgcolor != NULL)
{ {
if (fg.is_normal()) if (fg.is_normal() || fg.is_reset())
{ {
write_foreground_color(0); write_foreground_color(0);
writembs(tparm(exit_attribute_mode)); writembs(tparm(exit_attribute_mode));
@ -225,7 +225,7 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv)
if (bgcolor != NULL) if (bgcolor != NULL)
{ {
if (! bg.is_normal()) if (! bg.is_normal() && ! bg.is_reset())
{ {
write_background_color(index_for_color(bg)); write_background_color(index_for_color(bg));
} }