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

Fix allnoconfig warnings

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-11-18 21:42:44 +01:00
parent f4d0f4e7a9
commit 7e8218f9b2
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libbb/appletlib.c
View File

@ -883,20 +883,21 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
} }
# endif /* NUM_APPLETS > 0 */ # endif /* NUM_APPLETS > 0 */
# if ENABLE_BUSYBOX || NUM_APPLETS > 0
static NORETURN void run_applet_and_exit(const char *name, char **argv) static NORETURN void run_applet_and_exit(const char *name, char **argv)
{ {
# if ENABLE_BUSYBOX # if ENABLE_BUSYBOX
if (is_prefixed_with(name, "busybox")) if (is_prefixed_with(name, "busybox"))
exit(busybox_main(argv)); exit(busybox_main(argv));
# endif # endif
# if NUM_APPLETS > 0 # if NUM_APPLETS > 0
/* find_applet_by_name() search is more expensive, so goes second */ /* find_applet_by_name() search is more expensive, so goes second */
{ {
int applet = find_applet_by_name(name); int applet = find_applet_by_name(name);
if (applet >= 0) if (applet >= 0)
run_applet_no_and_exit(applet, argv); run_applet_no_and_exit(applet, argv);
} }
# endif # endif
/*bb_error_msg_and_die("applet not found"); - links in printf */ /*bb_error_msg_and_die("applet not found"); - links in printf */
full_write2_str(applet_name); full_write2_str(applet_name);
@ -904,11 +905,11 @@ static NORETURN void run_applet_and_exit(const char *name, char **argv)
/* POSIX: "If a command is not found, the exit status shall be 127" */ /* POSIX: "If a command is not found, the exit status shall be 127" */
exit(127); exit(127);
} }
# endif
#endif /* !defined(SINGLE_APPLET_MAIN) */ #endif /* !defined(SINGLE_APPLET_MAIN) */
#if ENABLE_BUILD_LIBBUSYBOX #if ENABLE_BUILD_LIBBUSYBOX
int lbb_main(char **argv) int lbb_main(char **argv)
#else #else
@ -960,6 +961,7 @@ int main(int argc UNUSED_PARAM, char **argv)
#endif #endif
#if defined(SINGLE_APPLET_MAIN) #if defined(SINGLE_APPLET_MAIN)
/* Only one applet is selected in .config */ /* Only one applet is selected in .config */
if (argv[1] && is_prefixed_with(argv[0], "busybox")) { if (argv[1] && is_prefixed_with(argv[0], "busybox")) {
/* "busybox <applet> <params>" should still work as expected */ /* "busybox <applet> <params>" should still work as expected */
@ -968,9 +970,16 @@ int main(int argc UNUSED_PARAM, char **argv)
/* applet_names in this case is just "applet\0\0" */ /* applet_names in this case is just "applet\0\0" */
lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv)); lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
return SINGLE_APPLET_MAIN(argc, argv); return SINGLE_APPLET_MAIN(argc, argv);
#else
lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
#elif !ENABLE_BUSYBOX && NUM_APPLETS == 0
full_write2_str(bb_basename(argv[0]));
full_write2_str(": no applets enabled\n");
exit(127);
#else
lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
# if !ENABLE_BUSYBOX # if !ENABLE_BUSYBOX
if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
argv++; argv++;
@ -979,9 +988,8 @@ int main(int argc UNUSED_PARAM, char **argv)
if (applet_name[0] == '-') if (applet_name[0] == '-')
applet_name++; applet_name++;
applet_name = bb_basename(applet_name); applet_name = bb_basename(applet_name);
parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
run_applet_and_exit(applet_name, argv); run_applet_and_exit(applet_name, argv);
#endif #endif
} }