Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 05:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make echo recognize -ne

Browse source
This commit is contained in:
ridiculousfish 2012-12-20 18:10:08 -08:00
parent 6b35250099
commit 2a91a7640c
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
builtin.cpp
View file

@ -1595,14 +1595,20 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
{
print_newline = false;
}
else if (! wcscmp(*argv, L"-s"))
{
print_spaces = false;
}
else if (! wcscmp(*argv, L"-e"))
{
interpret_special_chars = true;
}
else if (! wcscmp(*argv, L"-ne"))
{
print_newline = false;
interpret_special_chars = true;
}
else if (! wcscmp(*argv, L"-s"))
{
// fish-specific extension, which we should try to nix
print_spaces = false;
}
else if (! wcscmp(*argv, L"-E"))
{
interpret_special_chars = false;

4
exec.cpp
View file

@ -1469,13 +1469,13 @@ static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst)
{
// Look for the next separator
const char *stop = (const char *)memchr(cursor, sep, end - cursor);
bool hit_separator = (stop != NULL);
const bool hit_separator = (stop != NULL);
if (! hit_separator)
{
// If it's not found, just use the end
stop = end;
}
// Stop now points at the first character we do not want to copy)
// Stop now points at the first character we do not want to copy
const wcstring wc = str2wcstring(cursor, stop - cursor);
lst->push_back(wc);