Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 15:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

functions -q: Return false without an argument

Browse source 
This erroneously listed functions and returned true.
This commit is contained in:
Fabian Homborg 2019-02-01 18:29:54 +01:00
parent bfa051e466
commit 93c0d3f4a5
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/builtin_functions.cpp
View file

@ -337,6 +337,11 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
return STATUS_CMD_OK;
}
// If we query with no argument, just return false.
if (opts.query && argc == optind) {
return STATUS_CMD_ERROR;
}
if (opts.list || argc == optind) {
wcstring_list_t names = function_get_names(opts.show_hidden);
std::sort(names.begin(), names.end());

3
tests/function.err
View file

@ -29,3 +29,6 @@ fish: function: The name 'test' is reserved,
and can not be used as a function name
function test; echo banana; end
^
####################
# Checking `functions -q` without arguments

3
tests/function.in
View file

@ -48,4 +48,7 @@ diff (functions name3 | psub) (functions name3a | psub)
logmsg Checking reserved names
function test; echo banana; end
logmsg Checking `functions -q` without arguments
functions -q; or echo "False"
exit 0

4
tests/function.out
View file

@ -73,3 +73,7 @@ Function name4 not found as expected
####################
# Checking reserved names
####################
# Checking `functions -q` without arguments
False