7c3e96d4b
Denys Vlasenko
2021-10-12
Subject
shell: use more compact SHELL_ASH / HUSH config defines. no code changes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+2 -10
| @@ -1502,16 +1502,8 @@ int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE; | |
| /* Applets which are useful from another applets */ | |
| int bb_cat(char** argv) FAST_FUNC; | |
| - | int ash_main(int argc, char** argv) |
| - | #if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH |
| - | MAIN_EXTERNALLY_VISIBLE |
| - | #endif |
| - | ; |
| - | int hush_main(int argc, char** argv) |
| - | #if ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH |
| - | MAIN_EXTERNALLY_VISIBLE |
| - | #endif |
| - | ; |
| + | int ash_main(int argc, char** argv) IF_SHELL_ASH(MAIN_EXTERNALLY_VISIBLE); |
| + | int hush_main(int argc, char** argv) IF_SHELL_HUSH(MAIN_EXTERNALLY_VISIBLE); |
| /* If shell needs them, they exist even if not enabled as applets */ | |
| int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE); | |
| int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE); | |
shell/hush.c+1 -1
| @@ -373,7 +373,7 @@ | |
| # define F_DUPFD_CLOEXEC F_DUPFD | |
| #endif | |
| - | #if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS && !(ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH) |
| + | #if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS && !ENABLE_SHELL_ASH |
| # include "embedded_scripts.h" | |
| #else | |
| # define NUM_SCRIPTS 0 | |