aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-05 10:17:08 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-05 10:17:08 +0000
commit7d219aab70e6951ab82c27c202cac05016696723 (patch)
tree4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /shell
parent8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff)
downloadbusybox-7d219aab70e6951ab82c27c202cac05016696723.tar.gz
build system overhaul
Diffstat (limited to 'shell')
-rw-r--r--shell/Config.in148
-rw-r--r--shell/Kbuild12
-rw-r--r--shell/Makefile23
-rw-r--r--shell/Makefile.in33
-rw-r--r--shell/ash.c2
-rw-r--r--shell/cmdedit.c5
6 files changed, 86 insertions, 137 deletions
diff --git a/shell/Config.in b/shell/Config.in
index cfe081f2c..0e25bedcb 100644
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -7,36 +7,36 @@ menu "Shells"
choice
prompt "Choose your default shell"
- default CONFIG_FEATURE_SH_IS_NONE
+ default FEATURE_SH_IS_NONE
help
Choose a shell. The ash shell is the most bash compatible
and full featured one.
-config CONFIG_FEATURE_SH_IS_ASH
- select CONFIG_ASH
+config FEATURE_SH_IS_ASH
+ select ASH
bool "ash"
-config CONFIG_FEATURE_SH_IS_HUSH
- select CONFIG_HUSH
+config FEATURE_SH_IS_HUSH
+ select HUSH
bool "hush"
-config CONFIG_FEATURE_SH_IS_LASH
- select CONFIG_LASH
+config FEATURE_SH_IS_LASH
+ select LASH
bool "lash"
-config CONFIG_FEATURE_SH_IS_MSH
- select CONFIG_MSH
+config FEATURE_SH_IS_MSH
+ select MSH
bool "msh"
-config CONFIG_FEATURE_SH_IS_NONE
+config FEATURE_SH_IS_NONE
bool "none"
endchoice
-config CONFIG_ASH
+config ASH
bool "ash"
default n
- select CONFIG_TEST
+ select TEST
help
Tha 'ash' shell adds about 60k in the default configuration and is
the most complete and most pedantically correct shell included with
@@ -45,105 +45,105 @@ config CONFIG_ASH
(written by Kenneth Almquist) from NetBSD.
comment "Ash Shell Options"
- depends on CONFIG_ASH
+ depends on ASH
-config CONFIG_ASH_JOB_CONTROL
+config ASH_JOB_CONTROL
bool "Job control"
default y
- depends on CONFIG_ASH
+ depends on ASH
help
Enable job control in the ash shell.
-config CONFIG_ASH_READ_NCHARS
+config ASH_READ_NCHARS
bool "'read -n N' and 'read -s' support"
default n
- depends on CONFIG_ASH
+ depends on ASH
help
'read -n N' will return a value after N characters have been read.
'read -s' will read without echoing the user's input.
-config CONFIG_ASH_READ_TIMEOUT
+config ASH_READ_TIMEOUT
bool "'read -t S' support."
default n
- depends on CONFIG_ASH
+ depends on ASH
help
'read -t S' will return a value after S seconds have passed.
This implementation will allow fractional seconds, expressed
as a decimal fraction, e.g. 'read -t 2.5 foo'.
-config CONFIG_ASH_ALIAS
+config ASH_ALIAS
bool "alias support"
default y
- depends on CONFIG_ASH
+ depends on ASH
help
Enable alias support in the ash shell.
-config CONFIG_ASH_MATH_SUPPORT
+config ASH_MATH_SUPPORT
bool "Posix math support"
default y
- depends on CONFIG_ASH
+ depends on ASH
help
Enable math support in the ash shell.
-config CONFIG_ASH_MATH_SUPPORT_64
+config ASH_MATH_SUPPORT_64
bool "Extend Posix math support to 64 bit"
default n
- depends on CONFIG_ASH_MATH_SUPPORT
+ depends on ASH_MATH_SUPPORT
help
Enable 64-bit math support in the ash shell. This will make
the shell slightly larger, but will allow computation with very
large numbers.
-config CONFIG_ASH_GETOPTS
+config ASH_GETOPTS
bool "Builtin getopt to parse positional parameters"
default n
- depends on CONFIG_ASH
+ depends on ASH
help
Enable getopts builtin in the ash shell.
-config CONFIG_ASH_BUILTIN_ECHO
+config ASH_BUILTIN_ECHO
bool "Builtin version of 'echo'"
default y
- select CONFIG_ECHO
- depends on CONFIG_ASH
+ select ECHO
+ depends on ASH
help
Enable support for echo, built in to ash.
-config CONFIG_ASH_BUILTIN_TEST
+config ASH_BUILTIN_TEST
bool "Builtin version of 'test'"
default y
- select CONFIG_TEST
- depends on CONFIG_ASH
+ select TEST
+ depends on ASH
help
Enable support for test, built in to ash.
-config CONFIG_ASH_CMDCMD
+config ASH_CMDCMD
bool "'command' command to override shell builtins"
default n
- depends on CONFIG_ASH
+ depends on ASH
help
Enable support for the ash 'command' builtin, which allows
you to run the specified command with the specified arguments,
even when there is an ash builtin command with the same name.
-config CONFIG_ASH_MAIL
+config ASH_MAIL
bool "Check for new mail on interactive shells"
default y
- depends on CONFIG_ASH
+ depends on ASH
help
Enable "check for new mail" in the ash shell.
-config CONFIG_ASH_OPTIMIZE_FOR_SIZE
+config ASH_OPTIMIZE_FOR_SIZE
bool "Optimize for size instead of speed"
default y
- depends on CONFIG_ASH
+ depends on ASH
help
Compile ash for reduced size at the price of speed.
-config CONFIG_ASH_RANDOM_SUPPORT
+config ASH_RANDOM_SUPPORT
bool "Pseudorandom generator and variable $RANDOM"
default n
- depends on CONFIG_ASH
+ depends on ASH
help
Enable pseudorandom generator and dynamic variable "$RANDOM".
Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -151,21 +151,21 @@ config CONFIG_ASH_RANDOM_SUPPORT
After "unset RANDOM" then generator will switch off and this
variable will no longer have special treatment.
-config CONFIG_ASH_EXPAND_PRMT
+config ASH_EXPAND_PRMT
bool "Expand prompt string"
default n
- depends on CONFIG_ASH
+ depends on ASH
help
"PS#" may be contain volatile content, such as backquote commands.
This option recreates the prompt string from the environment
variable each time it is displayed.
-config CONFIG_HUSH
+config HUSH
bool "hush"
default n
- select CONFIG_TRUE
- select CONFIG_FALSE
- select CONFIG_TEST
+ select TRUE
+ select FALSE
+ select TEST
help
hush is a very small shell (just 18k) and it has fairly complete
Bourne shell grammar. It even handles all the normal flow control
@@ -177,12 +177,12 @@ config CONFIG_HUSH
expansion, &> and >& redirection of stdout+stderr, etc.
-config CONFIG_LASH
+config LASH
bool "lash"
default n
- select CONFIG_TRUE
- select CONFIG_FALSE
- select CONFIG_TEST
+ select TRUE
+ select FALSE
+ select TEST
help
lash is the very smallest shell (adds just 10k) and it is quite
usable as a command prompt, but it is not suitable for any but the
@@ -192,12 +192,12 @@ config CONFIG_LASH
command editing makes it a very nice lightweight command prompt.
-config CONFIG_MSH
+config MSH
bool "msh"
default n
- select CONFIG_TRUE
- select CONFIG_FALSE
- select CONFIG_TEST
+ select TRUE
+ select FALSE
+ select TEST
help
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
@@ -207,19 +207,19 @@ config CONFIG_MSH
It also uses only vfork, so it can be used on uClinux systems.
comment "Bourne Shell Options"
- depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+ depends on MSH || LASH || HUSH || ASH
-config CONFIG_FEATURE_SH_EXTRA_QUIET
+config FEATURE_SH_EXTRA_QUIET
bool "Hide message on interactive shell startup"
default n
- depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+ depends on MSH || LASH || HUSH || ASH
help
Remove the busybox introduction when starting a shell.
-config CONFIG_FEATURE_SH_STANDALONE_SHELL
+config FEATURE_SH_STANDALONE_SHELL
bool "Standalone shell"
default n
- depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+ depends on MSH || LASH || HUSH || ASH
help
This option causes the selected busybox shell to use busybox applets
in preference to executables in the PATH whenever possible. For
@@ -240,53 +240,53 @@ config CONFIG_FEATURE_SH_STANDALONE_SHELL
that exact location with that exact name, this option will not work at
all.
-config CONFIG_FEATURE_COMMAND_EDITING
+config FEATURE_COMMAND_EDITING
bool "Command line editing"
default n
- depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+ depends on MSH || LASH || HUSH || ASH
help
Enable command editing in shell.
-config CONFIG_FEATURE_COMMAND_EDITING_VI
+config FEATURE_COMMAND_EDITING_VI
bool "vi-style line editing commands"
default n
- depends on CONFIG_FEATURE_COMMAND_EDITING
+ depends on FEATURE_COMMAND_EDITING
help
Enable vi-style line editing in the shell. This mode can be
turned on and off with "set -o vi" and "set +o vi".
-config CONFIG_FEATURE_COMMAND_HISTORY
+config FEATURE_COMMAND_HISTORY
int "History size"
default 15
- depends on CONFIG_FEATURE_COMMAND_EDITING
+ depends on FEATURE_COMMAND_EDITING
help
Specify command history size in shell.
-config CONFIG_FEATURE_COMMAND_SAVEHISTORY
+config FEATURE_COMMAND_SAVEHISTORY
bool "History saving"
default n
- depends on CONFIG_ASH && CONFIG_FEATURE_COMMAND_EDITING
+ depends on ASH && FEATURE_COMMAND_EDITING
help
Enable history saving in ash shell.
-config CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+config FEATURE_COMMAND_TAB_COMPLETION
bool "Tab completion"
default n
- depends on CONFIG_FEATURE_COMMAND_EDITING
+ depends on FEATURE_COMMAND_EDITING
help
Enable tab completion in shell.
-config CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+config FEATURE_COMMAND_USERNAME_COMPLETION
bool "Username completion"
default n
- depends on CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+ depends on FEATURE_COMMAND_TAB_COMPLETION
help
Enable username completion in shell.
-config CONFIG_FEATURE_SH_FANCY_PROMPT
+config FEATURE_SH_FANCY_PROMPT
bool "Fancy shell prompts"
default n
- depends on CONFIG_FEATURE_COMMAND_EDITING
+ depends on FEATURE_COMMAND_EDITING
help
Setting this option allows for prompts to use things like \w and
\$ and also using escape codes.
diff --git a/shell/Kbuild b/shell/Kbuild
new file mode 100644
index 000000000..eb0199ee2
--- /dev/null
+++ b/shell/Kbuild
@@ -0,0 +1,12 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
+#
+# Licensed under the GPL v2, see the file LICENSE in this tarball.
+
+lib-y:=
+lib-$(CONFIG_ASH) += ash.o
+lib-$(CONFIG_HUSH) += hush.o
+lib-$(CONFIG_LASH) += lash.o
+lib-$(CONFIG_MSH) += msh.o
+lib-$(CONFIG_FEATURE_COMMAND_EDITING) += cmdedit.o
diff --git a/shell/Makefile b/shell/Makefile
deleted file mode 100644
index 9590f524e..000000000
--- a/shell/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile for busybox
-#
-# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-#
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
-
-ifndef top_srcdir
-top_srcdir=..
-endif
-ifndef top_builddir
-top_builddir=..
-endif
-srcdir=$(top_srcdir)/shell
-SHELL_DIR:=./
-include $(top_srcdir)/Rules.mak
-include $(top_builddir)/.config
-include Makefile.in
-all: $(libraries-y)
--include $(top_builddir)/.depend
-
-clean:
- rm -f *.o *.a $(AR_TARGET)
-
diff --git a/shell/Makefile.in b/shell/Makefile.in
deleted file mode 100644
index fcd93f345..000000000
--- a/shell/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# Makefile for busybox
-#
-# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-#
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
-
-SHELL_AR:=shell.a
-ifndef $(SHELL_DIR)
-SHELL_DIR:=$(top_builddir)/shell/
-endif
-srcdir=$(top_srcdir)/shell
-
-SHELLT-y:=
-SHELLT-$(CONFIG_ASH) += ash.o
-SHELLT-$(CONFIG_HUSH) += hush.o
-SHELLT-$(CONFIG_LASH) += lash.o
-SHELLT-$(CONFIG_MSH) += msh.o
-SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING) += cmdedit.o
-
-ifneq ($(strip $(SHELLT-y)),)
-libraries-y+=$(SHELL_DIR)$(SHELL_AR)
-endif
-
-SHELLT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SHELLT-y))
-SHELLT_SRC-a:=$(wildcard $(srcdir)/*.c)
-APPLET_SRC-y+=$(SHELLT_SRC-y)
-APPLET_SRC-a+=$(SHELLT_SRC-a)
-
-$(SHELL_DIR)$(SHELL_AR): $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
- $(do_ar)
-
-$(SHELL_DIR)%.o: $(srcdir)/%.c
- $(compile.c)
diff --git a/shell/ash.c b/shell/ash.c
index 0d9fa7fe2..3564044b2 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -81,8 +81,6 @@
#include <time.h>
#include <fnmatch.h>
-#include "pwd_.h"
-
#ifdef CONFIG_ASH_JOB_CONTROL
#define JOBS 1
#else
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index a9fc84798..7b4d46511 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -79,11 +79,6 @@
#define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
#endif
-#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
-#include "pwd_.h"
-#endif /* advanced FEATURES */
-
-
/* Maximum length of the linked list for the command line history */
#ifndef CONFIG_FEATURE_COMMAND_HISTORY
#define MAX_HISTORY 15