ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename two config options:

Browse source 
FEATURE_SH_STANDALONE_SHELL => FEATURE_SH_STANDALONE
FEATURE_EXEC_PREFER_APPLETS => FEATURE_PREFER_APPLETS
Make SH_STANDALONE depend on PREFER_APPLETS.
getopt.c: more randomconfig-induced fixes
This commit is contained in:
Denis Vlasenko 2007-04-10 23:03:30 +00:00
parent 8905496444
commit 80d14beae9
17 changed files with 67 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/msh.c
View file

@ -37,7 +37,7 @@
# define DEFAULT_SHELL "/proc/self/exe"
# define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe"
# define BB_BANNER "busybox standalone"
# define ENABLE_FEATURE_SH_STANDALONE_SHELL 0
# define ENABLE_FEATURE_SH_STANDALONE 0
# define bb_msg_memory_exhausted "memory exhausted"
# define xmalloc(size) malloc(size)
# define msh_main(argc,argv) main(argc,argv)
@ -3064,7 +3064,7 @@ static const char *rexecve(char *c, char **v, char **envp)
int eacces = 0, asis = 0;
char *name = c;
if (ENABLE_FEATURE_SH_STANDALONE_SHELL) {
if (ENABLE_FEATURE_SH_STANDALONE) {
optind = 1;
if (find_applet_by_name(name)) {
/* We have to exec here since we vforked. Running
@ -3195,7 +3195,7 @@ static int dohelp(struct op *t)
}
x++;
}
#if ENABLE_FEATURE_SH_STANDALONE_SHELL
#if ENABLE_FEATURE_SH_STANDALONE
{
const struct bb_applet *applet = applets;