projects / oweals / busybox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fdbac35)
Scrub away the last leftovers from BB_FEATURE_<shell>. Good thing
authorEric Andersen <andersen@codepoet.org>
Thu, 2 Aug 2001 08:42:58 +0000 (08:42 -0000)
committerEric Andersen <andersen@codepoet.org>
Thu, 2 Aug 2001 08:42:58 +0000 (08:42 -0000)
for multibuild.pl -- I would have missed this stupid mess otherwise.
 -Erik

Changelog patch | blob | history
Config.h patch | blob | history
cmdedit.c patch | blob | history
debian/Config.h-deb patch | blob | history
debian/Config.h-static patch | blob | history
debian/Config.h-udeb patch | blob | history
shell/cmdedit.c patch | blob | history

diff --git a/Changelog b/Changelog
index 6325417447f2ba600ebfcf2bd016a88da42a9f8b..4a8481ec3c98e430c892caf64e6c70d55aefbb0e 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
diff --git a/Config.h b/Config.h
index 831eb933ae56d772a0e159131d0ac7f911227055..2d332426a0f4f1d95995cba443e6e712b9e6d0d7 100644 (file)
--- 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 2ec81548d353f99ffff69953d9503a0e4ad02209..6386ea042e8c49cf67bd24bf683e5fe816bcf298 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 */
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 020f89d818fa30a4b96982c3bbbd398badc73787..7fe9f9597c31a4fc7e4318cf347bd1183e35a1f9 100644 (file)
--- 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 <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
@@ -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 a538b1a6344170ee599f8413724a209e174634ff..bbf4e577fafdf803d0f5afedb15309470c6c61ae 100644 (file)
--- 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 <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
@@ -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 172d3dc75b49aa47bbcaaf09b8bc25def5e607df..74d4c7200f35f54a65f827017361b34f341e49aa 100644 (file)
--- 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 <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
@@ -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 2ec81548d353f99ffff69953d9503a0e4ad02209..6386ea042e8c49cf67bd24bf683e5fe816bcf298 100644 (file)
--- 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 */
Unnamed repository; edit this file 'description' to name the repository.