aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-08-02 08:42:58 +0000
committerEric Andersen <andersen@codepoet.org>2001-08-02 08:42:58 +0000
commitff9b4a8981c4af9c6107ae4193c782ae3c94a23b (patch)
treed6b304098d3e3e0858e5199f78181cb207a4449e
parentfdbac35b332ae3e7789e2663d7e3b1144c061207 (diff)
downloadbusybox-w32-ff9b4a8981c4af9c6107ae4193c782ae3c94a23b.tar.gz
busybox-w32-ff9b4a8981c4af9c6107ae4193c782ae3c94a23b.tar.bz2
busybox-w32-ff9b4a8981c4af9c6107ae4193c782ae3c94a23b.zip
Scrub away the last leftovers from BB_FEATURE_<shell>. Good thing
for multibuild.pl -- I would have missed this stupid mess otherwise. -Erik
Diffstat
-rw-r--r--Changelog2
-rw-r--r--Config.h19
-rw-r--r--cmdedit.c2
-rw-r--r--debian/Config.h-deb34
-rw-r--r--debian/Config.h-static35
-rw-r--r--debian/Config.h-udeb36
-rw-r--r--shell/cmdedit.c2
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 @@
66 -- added "stopped jobs" warning to ash on exit 66 -- added "stopped jobs" warning to ash on exit
67 * Adam Slattery 67 * Adam Slattery
68 -- Fixed ping compile problem 68 -- Fixed ping compile problem
69 * Robert J. Osborne <rj@resourceinternational.com>
70 -- fixed a vi bug with delete and escape sequences on empty files.
69 71
70 72
71 -Erik Andersen, 31 July 2001 73 -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 @@
401#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__ 401#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
402 #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */ 402 #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
403 #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */ 403 #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
404 #undef BB_FEATURE_ASH /* Uses fork() */ 404 #undef BB_ASH /* Uses fork() */
405 #undef BB_FEATURE_HUSH /* Uses fork() */ 405 #undef BB_HUSH /* Uses fork() */
406 #undef BB_FEATURE_LASH /* Uses fork() */ 406 #undef BB_LASH /* Uses fork() */
407 #undef BB_INIT /* Uses fork() */ 407 #undef BB_INIT /* Uses fork() */
408 #undef BB_FEATURE_TAR_GZIP /* Uses fork() */ 408 #undef BB_FEATURE_TAR_GZIP /* Uses fork() */
409 #undef BB_SYSLOGD /* Uses daemon() */ 409 #undef BB_SYSLOGD /* Uses daemon() */
@@ -419,19 +419,6 @@
419 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 419 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
420 #undef BB_FEATURE_SH_FANCY_PROMPT 420 #undef BB_FEATURE_SH_FANCY_PROMPT
421 #endif 421 #endif
422 #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH
423 #define BB_FEATURE_MSH
424 #endif
425 #if defined BB_FEATURE_ASH
426 #undef BB_FEATURE_MSH
427 #undef BB_FEATURE_HUSH
428 #undef BB_FEATURE_LASH
429 #elif defined BB_FEATURE_MSH
430 #undef BB_FEATURE_HUSH
431 #undef BB_FEATURE_LASH
432 #elif defined BB_FEATURE_HUSH
433 #undef BB_FEATURE_LASH
434 #endif
435#else 422#else
436 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN 423 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
437 #undef BB_FEATURE_SH_STANDALONE_SHELL 424 #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])
1228 * if the len=0 and no chars to delete */ 1228 * if the len=0 and no chars to delete */
1229 if (len == 0) { 1229 if (len == 0) {
1230prepare_to_die: 1230prepare_to_die:
1231#if !defined(BB_FEATURE_ASH) 1231#if !defined(BB_ASH)
1232 printf("exit"); 1232 printf("exit");
1233 goto_new_line(); 1233 goto_new_line();
1234 /* cmdedit_reset_term() called in atexit */ 1234 /* 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 @@
391// Nothing beyond this point should ever be touched by 391// Nothing beyond this point should ever be touched by
392// mere mortals so leave this stuff alone. 392// mere mortals so leave this stuff alone.
393// 393//
394#include <features.h>
395#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
396 #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
397 #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
398 #undef BB_ASH /* Uses fork() */
399 #undef BB_HUSH /* Uses fork() */
400 #undef BB_LASH /* Uses fork() */
401 #undef BB_INIT /* Uses fork() */
402 #undef BB_FEATURE_TAR_GZIP /* Uses fork() */
403 #undef BB_SYSLOGD /* Uses daemon() */
404 #undef BB_KLOGD /* Uses daemon() */
405 #undef BB_UPDATE /* Uses daemon() */
406#endif
394#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH 407#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
395 #if defined BB_FEATURE_COMMAND_EDITING 408 #if defined BB_FEATURE_COMMAND_EDITING
396 #define BB_CMDEDIT 409 #define BB_CMDEDIT
@@ -400,26 +413,6 @@
400 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 413 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
401 #undef BB_FEATURE_SH_FANCY_PROMPT 414 #undef BB_FEATURE_SH_FANCY_PROMPT
402 #endif 415 #endif
403 #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH
404 #define BB_FEATURE_MSH
405 #endif
406 #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
407 #undef BB_FEATURE_LASH
408 #undef BB_FEATURE_HUSH
409 #undef BB_FEATURE_MSH
410 #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
411 #undef BB_FEATURE_LASH
412 #undef BB_FEATURE_HUSH
413 #undef BB_FEATURE_ASH
414 #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
415 #undef BB_FEATURE_LASH
416 #undef BB_FEATURE_MSH
417 #undef BB_FEATURE_ASH
418 #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
419 #undef BB_FEATURE_HUSH
420 #undef BB_FEATURE_MSH
421 #undef BB_FEATURE_ASH
422 #endif
423#else 416#else
424 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN 417 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
425 #undef BB_FEATURE_SH_STANDALONE_SHELL 418 #undef BB_FEATURE_SH_STANDALONE_SHELL
@@ -471,3 +464,4 @@
471# define BB_SH 464# define BB_SH
472# define shell_main msh_main 465# define shell_main msh_main
473#endif 466#endif
467
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 @@
391// Nothing beyond this point should ever be touched by 391// Nothing beyond this point should ever be touched by
392// mere mortals so leave this stuff alone. 392// mere mortals so leave this stuff alone.
393// 393//
394#include <features.h>
395#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
396 #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
397 #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
398 #undef BB_ASH /* Uses fork() */
399 #undef BB_HUSH /* Uses fork() */
400 #undef BB_LASH /* Uses fork() */
401 #undef BB_INIT /* Uses fork() */
402 #undef BB_FEATURE_TAR_GZIP /* Uses fork() */
403 #undef BB_SYSLOGD /* Uses daemon() */
404 #undef BB_KLOGD /* Uses daemon() */
405 #undef BB_UPDATE /* Uses daemon() */
406#endif
394#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH 407#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
395 #if defined BB_FEATURE_COMMAND_EDITING 408 #if defined BB_FEATURE_COMMAND_EDITING
396 #define BB_CMDEDIT 409 #define BB_CMDEDIT
@@ -400,26 +413,6 @@
400 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 413 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
401 #undef BB_FEATURE_SH_FANCY_PROMPT 414 #undef BB_FEATURE_SH_FANCY_PROMPT
402 #endif 415 #endif
403 #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH
404 #define BB_FEATURE_MSH
405 #endif
406 #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
407 #undef BB_FEATURE_LASH
408 #undef BB_FEATURE_HUSH
409 #undef BB_FEATURE_MSH
410 #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
411 #undef BB_FEATURE_LASH
412 #undef BB_FEATURE_HUSH
413 #undef BB_FEATURE_ASH
414 #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
415 #undef BB_FEATURE_LASH
416 #undef BB_FEATURE_MSH
417 #undef BB_FEATURE_ASH
418 #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
419 #undef BB_FEATURE_HUSH
420 #undef BB_FEATURE_MSH
421 #undef BB_FEATURE_ASH
422 #endif
423#else 416#else
424 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN 417 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
425 #undef BB_FEATURE_SH_STANDALONE_SHELL 418 #undef BB_FEATURE_SH_STANDALONE_SHELL
@@ -471,3 +464,5 @@
471# define BB_SH 464# define BB_SH
472# define shell_main msh_main 465# define shell_main msh_main
473#endif 466#endif
467
468
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 @@
391// Nothing beyond this point should ever be touched by 391// Nothing beyond this point should ever be touched by
392// mere mortals so leave this stuff alone. 392// mere mortals so leave this stuff alone.
393// 393//
394#include <features.h>
395#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
396 #undef BB_RPM2CPIO /* Uses gz_open(), which uses fork() */
397 #undef BB_DPKG_DEB /* Uses gz_open(), which uses fork() */
398 #undef BB_ASH /* Uses fork() */
399 #undef BB_HUSH /* Uses fork() */
400 #undef BB_LASH /* Uses fork() */
401 #undef BB_INIT /* Uses fork() */
402 #undef BB_FEATURE_TAR_GZIP /* Uses fork() */
403 #undef BB_SYSLOGD /* Uses daemon() */
404 #undef BB_KLOGD /* Uses daemon() */
405 #undef BB_UPDATE /* Uses daemon() */
406#endif
394#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH 407#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
395 #if defined BB_FEATURE_COMMAND_EDITING 408 #if defined BB_FEATURE_COMMAND_EDITING
396 #define BB_CMDEDIT 409 #define BB_CMDEDIT
@@ -400,26 +413,6 @@
400 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 413 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
401 #undef BB_FEATURE_SH_FANCY_PROMPT 414 #undef BB_FEATURE_SH_FANCY_PROMPT
402 #endif 415 #endif
403 #if ! defined BB_FEATURE_LASH && ! defined BB_FEATURE_HUSH && ! defined BB_FEATURE_MSH && ! defined BB_FEATURE_ASH
404 #define BB_FEATURE_MSH
405 #endif
406 #if defined BB_FEATURE_ASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
407 #undef BB_FEATURE_LASH
408 #undef BB_FEATURE_HUSH
409 #undef BB_FEATURE_MSH
410 #elif defined BB_FEATURE_MSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
411 #undef BB_FEATURE_LASH
412 #undef BB_FEATURE_HUSH
413 #undef BB_FEATURE_ASH
414 #elif defined BB_FEATURE_HUSH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
415 #undef BB_FEATURE_LASH
416 #undef BB_FEATURE_MSH
417 #undef BB_FEATURE_ASH
418 #elif defined BB_FEATURE_LASH && (defined BB_FEATURE_LASH || defined BB_FEATURE_HUSH || defined BB_FEATURE_MSH)
419 #undef BB_FEATURE_HUSH
420 #undef BB_FEATURE_MSH
421 #undef BB_FEATURE_ASH
422 #endif
423#else 416#else
424 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN 417 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
425 #undef BB_FEATURE_SH_STANDALONE_SHELL 418 #undef BB_FEATURE_SH_STANDALONE_SHELL
@@ -471,3 +464,6 @@
471# define BB_SH 464# define BB_SH
472# define shell_main msh_main 465# define shell_main msh_main
473#endif 466#endif
467
468
469
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])
1228 * if the len=0 and no chars to delete */ 1228 * if the len=0 and no chars to delete */
1229 if (len == 0) { 1229 if (len == 0) {
1230prepare_to_die: 1230prepare_to_die:
1231#if !defined(BB_FEATURE_ASH) 1231#if !defined(BB_ASH)
1232 printf("exit"); 1232 printf("exit");
1233 goto_new_line(); 1233 goto_new_line();
1234 /* cmdedit_reset_term() called in atexit */ 1234 /* cmdedit_reset_term() called in atexit */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 15:45:53 +0000