h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-11 22:21:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Added a -s option to echo to mean "don't output spaces"

Browse Source 
Replaced default prompt to stop calling printf. I opened a bug to replace the default prompt entirely with one that's cheaper.
This commit is contained in:
ridiculousfish
2012-05-19 16:59:56 -07:00
parent f1d22b6300
commit d09c9fba02
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
builtin.cpp
View File

@@ -1451,7 +1451,9 @@ static int builtin_functions( parser_t &parser, wchar_t **argv )
}
/** The echo builtin.
bash only respects -n if it's the first argument. We'll do the same. */
bash only respects -n if it's the first argument. We'll do the same.
We also support a new option -s to mean "no spaces"
*/
static int builtin_echo( parser_t &parser, wchar_t **argv )
{
@@ -1459,19 +1461,26 @@ static int builtin_echo( parser_t &parser, wchar_t **argv )
if (! *argv++)
return STATUS_BUILTIN_ERROR;
/* Process -n */
bool show_newline = true;
if (*argv && ! wcscmp(*argv, L"-n")) {
show_newline = false;
argv++;
/* Process options */
bool print_newline = true, print_spaces = true;
while (*argv) {
if (! wcscmp(*argv, L"-n")) {
print_newline = false;
argv++;
} else if (! wcscmp(*argv, L"-s")) {
print_spaces = false;
argv++;
} else {
break;
}
}
for (size_t idx = 0; argv[idx]; idx++) {
if (idx > 0)
if (print_spaces && idx > 0)
stdout_buffer.push_back(' ');
stdout_buffer.append(argv[idx]);
}
if (show_newline)
if (print_newline)
stdout_buffer.push_back('\n');
return STATUS_BUILTIN_OK;
}