From ff9b4a8981c4af9c6107ae4193c782ae3c94a23b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 2 Aug 2001 08:42:58 +0000 Subject: [PATCH] Scrub away the last leftovers from BB_FEATURE_. Good thing for multibuild.pl -- I would have missed this stupid mess otherwise. -Erik --- Changelog | 2 ++ Config.h | 19 +++---------------- cmdedit.c | 2 +- debian/Config.h-deb | 34 ++++++++++++++-------------------- debian/Config.h-static | 35 +++++++++++++++-------------------- debian/Config.h-udeb | 36 ++++++++++++++++-------------------- shell/cmdedit.c | 2 +- 7 files changed, 52 insertions(+), 78 deletions(-) diff --git a/Changelog b/Changelog index 632541744..4a8481ec3 100644 --- a/Changelog +++ b/Changelog @@ -66,6 +66,8 @@ -- added "stopped jobs" warning to ash on exit * Adam Slattery -- Fixed ping compile problem + * Robert J. Osborne + -- fixed a vi bug with delete and escape sequences on empty files. -Erik Andersen, 31 July 2001 diff --git a/Config.h b/Config.h index 831eb933a..2d332426a 100644 --- a/Config.h +++ b/Config.h @@ -401,9 +401,9 @@ #if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ - #undef BB_FEATURE_ASH /* Uses fork() */ - #undef BB_FEATURE_HUSH /* Uses fork() */ - #undef BB_FEATURE_LASH /* Uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ #undef BB_INIT /* Uses fork() */ #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ #undef BB_SYSLOGD /* Uses daemon() */ @@ -419,19 +419,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_LASH - #elif defined BB_FEATURE_MSH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_LASH - #elif defined BB_FEATURE_HUSH - #undef BB_FEATURE_LASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL diff --git a/cmdedit.c b/cmdedit.c index 2ec81548d..6386ea042 100644 --- a/cmdedit.c +++ b/cmdedit.c @@ -1228,7 +1228,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ]) * if the len=0 and no chars to delete */ if (len == 0) { prepare_to_die: -#if !defined(BB_FEATURE_ASH) +#if !defined(BB_ASH) printf("exit"); goto_new_line(); /* cmdedit_reset_term() called in atexit */ diff --git a/debian/Config.h-deb b/debian/Config.h-deb index 020f89d81..7fe9f9597 100644 --- a/debian/Config.h-deb +++ b/debian/Config.h-deb @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,4 @@ # define BB_SH # define shell_main msh_main #endif + diff --git a/debian/Config.h-static b/debian/Config.h-static index a538b1a63..bbf4e577f 100644 --- a/debian/Config.h-static +++ b/debian/Config.h-static @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,5 @@ # define BB_SH # define shell_main msh_main #endif + + diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb index 172d3dc75..74d4c7200 100644 --- a/debian/Config.h-udeb +++ b/debian/Config.h-udeb @@ -391,6 +391,19 @@ // Nothing beyond this point should ever be touched by // mere mortals so leave this stuff alone. // +#include +#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ + #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ + #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ + #undef BB_ASH /* Uses fork() */ + #undef BB_HUSH /* Uses fork() */ + #undef BB_LASH /* Uses fork() */ + #undef BB_INIT /* Uses fork() */ + #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ + #undef BB_SYSLOGD /* Uses daemon() */ + #undef BB_KLOGD /* Uses daemon() */ + #undef BB_UPDATE /* Uses daemon() */ +#endif #if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH #if defined BB_FEATURE_COMMAND_EDITING #define BB_CMDEDIT @@ -400,26 +413,6 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #undef BB_FEATURE_SH_FANCY_PROMPT #endif - #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH - #define BB_FEATURE_MSH - #endif - #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_LASH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH) - #undef BB_FEATURE_HUSH - #undef BB_FEATURE_MSH - #undef BB_FEATURE_ASH - #endif #else #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN #undef BB_FEATURE_SH_STANDALONE_SHELL @@ -471,3 +464,6 @@ # define BB_SH # define shell_main msh_main #endif + + + diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 2ec81548d..6386ea042 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -1228,7 +1228,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ]) * if the len=0 and no chars to delete */ if (len == 0) { prepare_to_die: -#if !defined(BB_FEATURE_ASH) +#if !defined(BB_ASH) printf("exit"); goto_new_line(); /* cmdedit_reset_term() called in atexit */