Scrub away the last leftovers from BB_FEATURE_<shell>. Good thing
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Thu, 2 Aug 2001 08:42:58 +0000 (08:42 +0000)
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Thu, 2 Aug 2001 08:42:58 +0000 (08:42 +0000)
for multibuild.pl -- I would have missed this stupid mess otherwise.
 -Erik

git-svn-id: svn://busybox.net/trunk/busybox@3185 69ca8d6d-28ef-0310-b511-8ec308f3f277

Changelog
Config.h
cmdedit.c
debian/Config.h-deb
debian/Config.h-static
debian/Config.h-udeb
shell/cmdedit.c

index 6325417..4a8481e 100644 (file)
--- 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 <rj@resourceinternational.com>
+           -- fixed a vi bug with delete and escape sequences on empty files.
 
 
         -Erik Andersen, 31 July 2001
index 831eb93..2d33242 100644 (file)
--- a/Config.h
+++ b/Config.h
 #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() */
                #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
index 2ec8154..6386ea0 100644 (file)
--- 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 */
index 020f89d..7fe9f95 100644 (file)
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
+#include <features.h>
+#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
                #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
 # define BB_SH
 # define shell_main msh_main
 #endif
+
index a538b1a..bbf4e57 100644 (file)
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
+#include <features.h>
+#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
                #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
 # define BB_SH
 # define shell_main msh_main
 #endif
+
+
index 172d3dc..74d4c72 100644 (file)
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
+#include <features.h>
+#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
                #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
 # define BB_SH
 # define shell_main msh_main
 #endif
+
+
+
index 2ec8154..6386ea0 100644 (file)
@@ -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 */