diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-05-19 02:39:51 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 21:42:55 +0000 |
| commit | e8b1ed5d253922aeb880518f27312b112e360f09 (patch) | |
| tree | d7415077f2939a0e5009cae83d85066662fd9a9e | |
| parent | 604d3a0a1570f3478360913c2935ea53d18857e6 (diff) | |
| download | klibc-e8b1ed5d253922aeb880518f27312b112e360f09.tar.gz | |
[klibc] dash: exec: Never rehash regular built-ins
[ dash commit 59e62c9a3c67eef2bf9dc86e5bf0b2c88d6e8571 ]
As regular (including special) built-ins can never be overridden,
we should never remove them from the hash table.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/exec.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/usr/dash/exec.c b/usr/dash/exec.c index 8948754bbc86d..6c0a64f6460fa 100644 --- a/usr/dash/exec.c +++ b/usr/dash/exec.c @@ -287,9 +287,11 @@ hashcmd(int argc, char **argv) } c = 0; while ((name = *argptr) != NULL) { - if ((cmdp = cmdlookup(name, 0)) != NULL - && (cmdp->cmdtype == CMDNORMAL - || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) + if ((cmdp = cmdlookup(name, 0)) && + (cmdp->cmdtype == CMDNORMAL || + (cmdp->cmdtype == CMDBUILTIN && + !(cmdp->param.cmd->flags & BUILTIN_REGULAR) && + builtinloc > 0))) delete_cmd_entry(); find_command(name, &entry, DO_ERR, pathval()); if (entry.cmdtype == CMDUNKNOWN) @@ -377,7 +379,8 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) bit = DO_NOFUNC; break; case CMDBUILTIN: - bit = DO_ALTBLTIN; + bit = cmdp->param.cmd->flags & BUILTIN_REGULAR ? + 0 : DO_ALTBLTIN; break; } if (act & bit) { @@ -601,7 +604,9 @@ clearcmdentry(void) pp = tblp; while ((cmdp = *pp) != NULL) { if (cmdp->cmdtype == CMDNORMAL || - (cmdp->cmdtype == CMDBUILTIN && builtinloc > 0)) { + (cmdp->cmdtype == CMDBUILTIN && + !(cmdp->param.cmd->flags & BUILTIN_REGULAR) && + builtinloc > 0)) { *pp = cmdp->next; ckfree(cmdp); } else { |