external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

whence -a: fix spurious 'undefined function' message

Browse source 
$ ksh -c 'whence -a printf'
	printf is a shell builtin
	printf is /usr/bin/printf
	printf is an undefined function

The third line should not appear.

src/cmd/ksh93/bltins/whence.c:
- Remove faulty extra check for undefined (= autoload) functions.
  This was already handled earlier, on lines 192-193.

src/cmd/ksh93/tests/builtins.sh:
- Add regression test.
- For previous 'whence -a' test, don't bother with shell function.

Fixes https://github.com/ksh93/ksh/issues/26
This commit is contained in:
Martijn Dekker 2020-07-20 16:49:17 +01:00
parent b2bdbef561
commit 01c25cb14b
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/ksh93/bltins/whence.c
View file

@ -250,8 +250,6 @@ static int whence(Shell_t *shp,char **argv, register int flags)
const char *command_path = np->nvalue.pathcomp->name; const char *command_path = np->nvalue.pathcomp->name;
sfprintf(sfstdout,"%s %s %s/%s\n",name,sh_translate(is_talias),command_path,cp); sfprintf(sfstdout,"%s %s %s/%s\n",name,sh_translate(is_talias),command_path,cp);
} }
else if(!np || nv_isnull(np))
sfprintf(sfstdout,"%s%s\n",name,sh_translate(is_ufunction));
continue; continue;
} }
sfputr(sfstdout,sh_fmtq(name),' '); sfputr(sfstdout,sh_fmtq(name),' ');

19
src/cmd/ksh93/tests/builtins.sh
View file

@ -732,20 +732,27 @@ foo=BUG command eval ':'
[[ $foo == BUG ]] && err_exit '`command` fails to disable the special properties of special builtins' [[ $foo == BUG ]] && err_exit '`command` fails to disable the special properties of special builtins'
# ====== # ======
# `whence -a` should not base the path of tracked aliases on the current directory # 'whence -a' tests
run_whence()
{ # wrong path to tracked aliases after loading builtin: https://github.com/ksh93/ksh/pull/25
whence -a chmod >> /dev/null actual=$("$SHELL" -c '
whence chmod >/dev/null # add to hash table (create tracked alias)
builtin chmod builtin chmod
whence -a chmod whence -a chmod
} ')
actual="$(run_whence)"
expected="chmod is a shell builtin expected="chmod is a shell builtin
$(whence -a -p chmod | sed 's/^/chmod is /') $(whence -a -p chmod | sed 's/^/chmod is /')
chmod is a tracked alias for $(whence -p chmod)" chmod is a tracked alias for $(whence -p chmod)"
[[ $actual == $expected ]] || err_exit "'whence -a' does not work correctly with tracked aliases" \ [[ $actual == $expected ]] || err_exit "'whence -a' does not work correctly with tracked aliases" \
"(expected $(printf %q "$expected"), got $(printf %q "$actual"))" "(expected $(printf %q "$expected"), got $(printf %q "$actual"))"
# spurious 'undefined function' message: https://github.com/ksh93/ksh/issues/26
actual=$("$SHELL" -c 'whence -a printf')
expected="printf is a shell builtin
$(whence -a -p printf | sed 's/^/printf is /')"
[[ $actual == $expected ]] || err_exit "'whence -a': incorrect output" \
"(expected $(printf %q "$expected"), got $(printf %q "$actual"))"
# ====== # ======
# 'cd ../.foo' should not exclude the '.' in '.foo' # 'cd ../.foo' should not exclude the '.' in '.foo'
( (