diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /shell/ash.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'shell/ash.c')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 45ec13097..ccf4288a9 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -7978,7 +7978,7 @@ hashcd(void) | |||
| 7978 | for (cmdp = *pp; cmdp; cmdp = cmdp->next) { | 7978 | for (cmdp = *pp; cmdp; cmdp = cmdp->next) { |
| 7979 | if (cmdp->cmdtype == CMDNORMAL | 7979 | if (cmdp->cmdtype == CMDNORMAL |
| 7980 | || (cmdp->cmdtype == CMDBUILTIN | 7980 | || (cmdp->cmdtype == CMDBUILTIN |
| 7981 | && !IS_BUILTIN_REGULAR(cmdp->param.cmd) | 7981 | && !IS_BUILTIN_REGULAR(cmdp->param.cmd) |
| 7982 | && builtinloc > 0) | 7982 | && builtinloc > 0) |
| 7983 | ) { | 7983 | ) { |
| 7984 | cmdp->rehash = 1; | 7984 | cmdp->rehash = 1; |
| @@ -12825,7 +12825,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) | |||
| 12825 | } | 12825 | } |
| 12826 | if ((act & DO_NOFUNC) | 12826 | if ((act & DO_NOFUNC) |
| 12827 | || !prefix(pathopt, "func") | 12827 | || !prefix(pathopt, "func") |
| 12828 | ) { /* ignore unimplemented options */ | 12828 | ) { /* ignore unimplemented options */ |
| 12829 | continue; | 12829 | continue; |
| 12830 | } | 12830 | } |
| 12831 | } | 12831 | } |