emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: exec: Never rehash regular built-ins

Browse Source 
Upstream commit:

    Date: Sat, 19 May 2018 02:39:51 +0800
    exec: Never rehash regular built-ins

    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: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-17 16:20:05 +01:00
parent 6c4f87e411
commit 22c75924da
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell/ash.c
View File

@ -8284,7 +8284,10 @@ clearcmdentry(void)
pp = tblp; pp = tblp;
while ((cmdp = *pp) != NULL) { while ((cmdp = *pp) != NULL) {
if (cmdp->cmdtype == CMDNORMAL if (cmdp->cmdtype == CMDNORMAL
|| (cmdp->cmdtype == CMDBUILTIN && builtinloc > 0) || (cmdp->cmdtype == CMDBUILTIN
&& !IS_BUILTIN_REGULAR(cmdp->param.cmd)
&& builtinloc > 0
)
) { ) {
*pp = cmdp->next; *pp = cmdp->next;
free(cmdp); free(cmdp);
@ -8403,7 +8406,11 @@ hashcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
cmdp = cmdlookup(name, 0); cmdp = cmdlookup(name, 0);
if (cmdp != NULL if (cmdp != NULL
&& (cmdp->cmdtype == CMDNORMAL && (cmdp->cmdtype == CMDNORMAL
|| (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)) || (cmdp->cmdtype == CMDBUILTIN
&& !IS_BUILTIN_REGULAR(cmdp->param.cmd)
&& builtinloc > 0
)
)
) { ) {
delete_cmd_entry(); delete_cmd_entry();
} }
@ -13556,7 +13563,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
bit = DO_NOFUNC; bit = DO_NOFUNC;
break; break;
case CMDBUILTIN: case CMDBUILTIN:
bit = DO_ALTBLTIN; bit = IS_BUILTIN_REGULAR(cmdp->param.cmd) ? 0 : DO_ALTBLTIN;
break; break;
} }
if (act & bit) { if (act & bit) {