Fix a two decade old bug in whence -a
#25
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This bug was originally reported by @DavidMorano about two decades ago to the AST team (ref att#954). `whence -a` bases the path for tracked aliases on the user's current working directory if it an enabled ksh builtin of the same name is also available. The following example will claim `cat` is in the user's current working directory: $ whence -a cat is a tracked alias for /usr/bin/cat $ builtin cat $ whence -a cat cat is a shell builtin cat is /usr/bin/cat cat is a tracked alias for /current/working/directory/cat This patch from ksh2020 (att#1049) fixes this problem by properly saving the path of the tracked alias for use with `whence -a`, since `path_pwd` (as implied by the function's name) only gets the users current working directory, not the location of tracked aliases. src/cmd/ksh93/bltins/whence.c: - Print the actual path of a tracked alias, path_pwd doesn't have this functionality. src/cmd/ksh93/include/name.h: - Add `pathcomp` for saving the value of tracked aliases. src/cmd/ksh93/sh/path.c: - Save the value of tracked aliases for use by whence. src/cmd/ksh93/tests/builtins.sh: - Add a regression test for using `whence -a` on tracked aliases with a builtin equivalent.
|
Hmm. For the first Thanks for the pull request – looks good. |
That was a copy/paste error, thanks for pointing that out. |
McDutchie
pushed a commit
that referenced
this pull request
Jun 19, 2020
'whence -a' bases the path for tracked aliases on the user's current working directory if an enabled ksh builtin of the same name is also available. The following example will claim 'cat' is in the user's current working directory: $ whence -a cat cat is a tracked alias for /usr/bin/cat $ builtin cat $ whence -a cat cat is a shell builtin cat is /usr/bin/cat cat is a tracked alias for /current/working/directory/cat This patch from ksh2020 fixes this problem by properly saving the path of the tracked alias for use with 'whence -a', since 'path_pwd' (as implied by the function's name) only gets the users current working directory, not the location of tracked aliases. Ref.: att#1049 This bug was originally reported by David Morano about two decades ago to the AST team: att#954 src/cmd/ksh93/bltins/whence.c: - Print the actual path of a tracked alias, path_pwd doesn't have this functionality. src/cmd/ksh93/include/name.h: - Add 'pathcomp' for saving the value of tracked aliases. src/cmd/ksh93/sh/path.c: - Save the value of tracked aliases for use by whence. src/cmd/ksh93/tests/builtins.sh: - Add a regression test for using 'whence -a' on tracked aliases with a builtin equivalent.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request (which is properly tested this time) fixes a bug that was originally reported by @DavidMorano about two decades ago to the AST team (ref att#954).
whence -abases the path for tracked aliases on the user's current working directory if it an enabled ksh builtin of the same name is also available. The following example will claimcatis in the user's current working directory:This happens because
whence -adetermines the path to tracked aliases withpath_pwd, which is only meant for getting the current working directory (likepwd). The fix is to properly save the path of the tracked alias for use withwhence -a.Note: If the first
whence -acommand in the example is not run first, whence will claimcatis an undefined function. This is unfortunately not fixed by this pull request.