From 51ca7761a3579f3c3f7e771b39019e6e248a5171 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Jul 2010 17:16:40 +0200 Subject: cttyhack: move build system bits into cttyhack.c, no code changes Signed-off-by: Denys Vlasenko --- shell/Config.src | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'shell/Config.src') diff --git a/shell/Config.src b/shell/Config.src index 6389d943a..f6f0b6c94 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -158,40 +158,4 @@ config FEATURE_SH_NOFORK This feature is relatively new. Use with care. -config CTTYHACK - bool "cttyhack" - default y - help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when - one tries to use shell with stdin/stdout opened to /dev/console. - This device is special - it cannot be a controlling tty. - - Proper solution is to use correct device instead of /dev/console. - - cttyhack provides "quick and dirty" solution to this problem. - It analyzes stdin with various ioctls, trying to determine whether - it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). - If it detects one, it closes stdin/out/err and reopens that device. - Then it executes given program. Opening the device will make - that device a controlling tty. This may require cttyhack - to be a session leader. - - Example for /etc/inittab (for busybox init): - - ::respawn:/bin/cttyhack /bin/sh - - Starting an interactive shell from boot shell script: - - setsid cttyhack sh - - Giving controlling tty to shell running with PID 1: - - # exec cttyhack sh - - Without cttyhack, you need to know exact tty name, - and do something like this: - - # exec setsid sh -c 'exec sh /dev/tty1 2>&1' - endmenu -- cgit v1.2.3-55-g6feb From 6adf2aad38cf2f5a056f9014955807607bcb41b2 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Jul 2010 19:26:38 +0200 Subject: hush: move msh/lash config into hush.c, no code changes Signed-off-by: Denys Vlasenko --- shell/Config.src | 23 ----------------------- shell/hush.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 23 deletions(-) (limited to 'shell/Config.src') diff --git a/shell/Config.src b/shell/Config.src index f6f0b6c94..c9c2439e7 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -62,29 +62,6 @@ config FEATURE_BASH_IS_NONE endchoice -config LASH - bool "lash (deprecated: aliased to hush)" - default n - select HUSH - help - lash is deprecated and will be removed, please migrate to hush. - -config MSH - bool "msh (deprecated: please use hush)" - default n - select HUSH - help - msh is deprecated and will be removed, please migrate to hush. - If there is a feature msh has but hush does not, please let us know. - -# The minix shell (adds just 30k) is quite complete and handles things -# like for/do/done, case/esac and all the things you expect a Bourne -# shell to do. It is not always pedantically correct about Bourne -# shell grammar (try running the shell testscript "tests/sh.testcases" -# on it and compare vs bash) but for most things it works quite well. -# It uses only vfork, so it can be used on uClinux systems. - - config SH_MATH_SUPPORT bool "POSIX math support" default y diff --git a/shell/hush.c b/shell/hush.c index 56a3f4b14..9208ec497 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -224,6 +224,20 @@ //config: This instructs hush to print commands before execution. //config: Adds ~300 bytes. //config: +//config:config LASH +//config: bool "lash (deprecated: aliased to hush)" +//config: default n +//config: select HUSH +//config: help +//config: lash is deprecated and will be removed, please migrate to hush. +//config: +//config:config MSH +//config: bool "msh (deprecated: aliased to hush)" +//config: default n +//config: select HUSH +//config: help +//config: msh is deprecated and will be removed, please migrate to hush. +//config: //usage:#define hush_trivial_usage NOUSAGE_STR //usage:#define hush_full_usage "" -- cgit v1.2.3-55-g6feb