diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2021-10-12 01:24:32 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-10-12 01:24:32 +0200 |
| commit | 7c3e96d4b3d419d76f97e17d42a4401ee685b7ec (patch) | |
| tree | f52e708d297940c0befd7a330e229332f3389ff5 | |
| parent | f4fcd74a6e3d5cd2ec44cd6ce90be8a0ed108467 (diff) | |
| download | busybox-7c3e96d4b3d419d76f97e17d42a4401ee685b7ec.tar.gz | |
shell: use more compact SHELL_ASH / HUSH config defines. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 12 | ||||
| -rw-r--r-- | shell/hush.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2a0b272c6..a48782832 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -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); diff --git a/shell/hush.c b/shell/hush.c index 7156297cf..38d924a3f 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -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 |