da7a6dbfa
Ron Yorston
2020-04-30
Subject
ash: fix build failure when command built-in is disabled
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c+3 -1
| @@ -8675,7 +8675,6 @@ typecmd(int argc UNUSED_PARAM, char **argv) | |
| return err; | |
| } | |
| - | #if ENABLE_ASH_CMDCMD |
| static struct strlist * | |
| fill_arglist(struct arglist *arglist, union node **argpp) | |
| { | |
| @@ -8692,6 +8691,7 @@ fill_arglist(struct arglist *arglist, union node **argpp) | |
| return *lastp; | |
| } | |
| + | #if ENABLE_ASH_CMDCMD |
| /* Is it "command [-p] PROG ARGS" bltin, no other opts? Return ptr to "PROG" if yes */ | |
| static int | |
| parse_command_args(struct arglist *arglist, union node **argpp, const char **path) | |
| @@ -10190,11 +10190,13 @@ evalcommand(union node *cmd, int flags) | |
| vlocal = !spclbltin; | |
| } | |
| cmd_is_exec = cmdentry.u.cmd == EXECCMD; | |
| + | #if ENABLE_ASH_CMDCMD |
| if (cmdentry.u.cmd != COMMANDCMD) | |
| break; | |
| cmd_flag = parse_command_args(&arglist, &argp, &path); | |
| if (!cmd_flag) | |
| + | #endif |
| break; | |
| } | |