mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-11 15:37:24 +00:00
22d1aaa27d
Since set_color was changed to a built-in command, the entire shell will exit in the event that setupterm() fails for some reason since ncurses does an exit() if an errret was not passed in. setupterm() can fail if the TERM environment variable is not set. This can cause the shell to die prematurely if set_color is called from a startup file like config.fish (such as vi-mode.fish which caches the results of set_color when it is loaded) and fish is started without a TERM set (e.g. when started from .xsession, or when being used as a remote shell by a command such as rsync, scp or git) A simple repro case for this issue is: ian@delenn~ [i]> echo set_color normal > ~/.config/fish/config.fish ian@delenn~ [i]> scp localhost:test . TERM environment variable not set. ian@delenn~ [i]> This patch passes in an errret variable to setupterm(), which causes ncurses to return the error to builtin_set_color() rather than calling exit(): ian@delenn~ [i]> scp localhost:test . test 100% 0 0.0KB/s 00:00 ian@delenn~ [i]> Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
243 lines
5.8 KiB
C++
243 lines
5.8 KiB
C++
/** \file builtin_set_color.cpp Functions defining the set_color builtin
|
|
|
|
Functions used for implementing the set_color builtin.
|
|
|
|
*/
|
|
#include "config.h"
|
|
|
|
#include "builtin.h"
|
|
#include "color.h"
|
|
#include "output.h"
|
|
|
|
#if HAVE_NCURSES_H
|
|
#include <ncurses.h>
|
|
#else
|
|
#include <curses.h>
|
|
#endif
|
|
|
|
#if HAVE_TERM_H
|
|
#include <term.h>
|
|
#elif HAVE_NCURSES_TERM_H
|
|
#include <ncurses/term.h>
|
|
#endif
|
|
|
|
|
|
/* We know about these buffers */
|
|
extern wcstring stdout_buffer, stderr_buffer;
|
|
|
|
/**
|
|
Error message for invalid path operations
|
|
*/
|
|
#define BUILTIN_SET_PATH_ERROR L"%ls: Warning: path component %ls may not be valid in %ls.\n"
|
|
|
|
/**
|
|
Hint for invalid path operation with a colon
|
|
*/
|
|
#define BUILTIN_SET_PATH_HINT L"%ls: Did you mean 'set %ls $%ls %ls'?\n"
|
|
|
|
/**
|
|
Error for mismatch between index count and elements
|
|
*/
|
|
#define BUILTIN_SET_ARG_COUNT L"%ls: The number of variable indexes does not match the number of values\n"
|
|
|
|
static void print_colors(void)
|
|
{
|
|
const wcstring_list_t result = rgb_color_t::named_color_names();
|
|
size_t i;
|
|
for (i=0; i < result.size(); i++)
|
|
{
|
|
stdout_buffer.append(result.at(i));
|
|
stdout_buffer.push_back(L'\n');
|
|
}
|
|
}
|
|
|
|
/* function we set as the output writer */
|
|
static std::string builtin_set_color_output;
|
|
static int set_color_builtin_outputter(char c)
|
|
{
|
|
ASSERT_IS_MAIN_THREAD();
|
|
builtin_set_color_output.push_back(c);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
set_color builtin
|
|
*/
|
|
static int builtin_set_color(parser_t &parser, wchar_t **argv)
|
|
{
|
|
/** Variables used for parsing the argument list */
|
|
const struct woption long_options[] =
|
|
{
|
|
{ L"background", required_argument, 0, 'b'},
|
|
{ L"help", no_argument, 0, 'h' },
|
|
{ L"bold", no_argument, 0, 'o' },
|
|
{ L"underline", no_argument, 0, 'u' },
|
|
{ L"version", no_argument, 0, 'v' },
|
|
{ L"print-colors", no_argument, 0, 'c' },
|
|
{ 0, 0, 0, 0 }
|
|
};
|
|
|
|
const wchar_t *short_options = L"b:hvocu";
|
|
|
|
int argc = builtin_count_args(argv);
|
|
|
|
const wchar_t *bgcolor = NULL;
|
|
bool bold = false, underline=false;
|
|
int errret;
|
|
|
|
/* Parse options to obtain the requested operation and the modifiers */
|
|
woptind = 0;
|
|
while (1)
|
|
{
|
|
int c = wgetopt_long(argc, argv, short_options, long_options, 0);
|
|
|
|
if (c == -1)
|
|
{
|
|
break;
|
|
}
|
|
|
|
switch (c)
|
|
{
|
|
case 0:
|
|
break;
|
|
|
|
case 'b':
|
|
bgcolor = woptarg;
|
|
break;
|
|
|
|
case 'h':
|
|
builtin_print_help(parser, argv[0], stdout_buffer);
|
|
return STATUS_BUILTIN_OK;
|
|
|
|
case 'o':
|
|
bold = true;
|
|
break;
|
|
|
|
case 'u':
|
|
underline = true;
|
|
break;
|
|
|
|
case 'c':
|
|
print_colors();
|
|
return STATUS_BUILTIN_OK;
|
|
|
|
case '?':
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
}
|
|
|
|
/* Remaining argument is foreground color */
|
|
const wchar_t *fgcolor = NULL;
|
|
if (woptind < argc)
|
|
{
|
|
if (woptind + 1 == argc)
|
|
{
|
|
fgcolor = argv[woptind];
|
|
}
|
|
else
|
|
{
|
|
append_format(stderr_buffer,
|
|
_(L"%ls: Too many arguments\n"),
|
|
argv[0]);
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
}
|
|
|
|
if (fgcolor == NULL && bgcolor == NULL && !bold && !underline)
|
|
{
|
|
append_format(stderr_buffer,
|
|
_(L"%ls: Expected an argument\n"),
|
|
argv[0]);
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
|
|
const rgb_color_t fg = rgb_color_t(fgcolor ? fgcolor : L"");
|
|
if (fgcolor && fg.is_none())
|
|
{
|
|
append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], fgcolor);
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
|
|
const rgb_color_t bg = rgb_color_t(bgcolor ? bgcolor : L"");
|
|
if (bgcolor && bg.is_none())
|
|
{
|
|
append_format(stderr_buffer, _(L"%ls: Unknown color '%ls'\n"), argv[0], bgcolor);
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
|
|
/* Make sure that the term exists */
|
|
if (cur_term == NULL && setupterm(0, STDOUT_FILENO, &errret) == ERR)
|
|
{
|
|
append_format(stderr_buffer, _(L"%ls: Could not set up terminal\n"), argv[0]);
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
|
|
/*
|
|
Test if we have at least basic support for setting fonts, colors
|
|
and related bits - otherwise just give up...
|
|
*/
|
|
if (! exit_attribute_mode)
|
|
{
|
|
return STATUS_BUILTIN_ERROR;
|
|
}
|
|
|
|
|
|
/* Save old output function so we can restore it */
|
|
int (* const saved_writer_func)(char) = output_get_writer();
|
|
|
|
/* Set our output function, which writes to a std::string */
|
|
builtin_set_color_output.clear();
|
|
output_set_writer(set_color_builtin_outputter);
|
|
|
|
if (bold)
|
|
{
|
|
if (enter_bold_mode)
|
|
writembs(tparm(enter_bold_mode));
|
|
}
|
|
|
|
if (underline)
|
|
{
|
|
if (enter_underline_mode)
|
|
writembs(enter_underline_mode);
|
|
}
|
|
|
|
if (bgcolor != NULL)
|
|
{
|
|
if (bg.is_normal())
|
|
{
|
|
write_background_color(0);
|
|
writembs(tparm(exit_attribute_mode));
|
|
}
|
|
}
|
|
|
|
if (fgcolor != NULL)
|
|
{
|
|
if (fg.is_normal())
|
|
{
|
|
write_foreground_color(0);
|
|
writembs(tparm(exit_attribute_mode));
|
|
}
|
|
else
|
|
{
|
|
write_foreground_color(index_for_color(fg));
|
|
}
|
|
}
|
|
|
|
if (bgcolor != NULL)
|
|
{
|
|
if (! bg.is_normal())
|
|
{
|
|
write_background_color(index_for_color(bg));
|
|
}
|
|
}
|
|
|
|
/* Restore saved writer function */
|
|
output_set_writer(saved_writer_func);
|
|
|
|
/* Output the collected string */
|
|
std::string local_output;
|
|
std::swap(builtin_set_color_output, local_output);
|
|
stdout_buffer.append(str2wcstring(local_output));
|
|
|
|
return STATUS_BUILTIN_OK;
|
|
}
|