summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatt Kraai2001-08-01 17:21:35 +0000
committerMatt Kraai2001-08-01 17:21:35 +0000
commit2d91deba45d5a284614e06cc55e2be03599ca26d (patch)
tree0ba0d2096b4305465ddea8532a5931cb4c02b343 /include
parent00344431402703089c6b93f6119f9966cc7ba566 (diff)
downloadbusybox-2d91deba45d5a284614e06cc55e2be03599ca26d.zip
busybox-2d91deba45d5a284614e06cc55e2be03599ca26d.tar.gz
Allow multiple shells to be enabled.
Diffstat (limited to 'include')
-rw-r--r--include/applets.h22
-rw-r--r--include/usage.h6
2 files changed, 23 insertions, 5 deletions
diff --git a/include/applets.h b/include/applets.h
index 0786c39..184bce0 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -52,6 +52,9 @@
#ifdef BB_AR
APPLET(ar, ar_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_ASH
+ APPLET_NOUSAGE("ash", ash_main, _BB_DIR_BIN)
+#endif
#ifdef BB_BASENAME
APPLET(basename, basename_main, _BB_DIR_USR_BIN)
#endif
@@ -185,6 +188,9 @@
#ifdef BB_HOSTNAME
APPLET(hostname, hostname_main, _BB_DIR_BIN)
#endif
+#ifdef BB_HUSH
+ APPLET_NOUSAGE("hush", hush_main, _BB_DIR_BIN)
+#endif
#ifdef BB_ID
APPLET(id, id_main, _BB_DIR_USR_BIN)
#endif
@@ -206,6 +212,9 @@
#ifdef BB_KLOGD
APPLET(klogd, klogd_main, _BB_DIR_SBIN)
#endif
+#ifdef BB_LASH
+ APPLET(lash, lash_main, _BB_DIR_BIN)
+#endif
#ifdef BB_LENGTH
APPLET(length, length_main, _BB_DIR_USR_BIN)
#endif
@@ -272,6 +281,9 @@
#ifdef BB_MOUNT
APPLET(mount, mount_main, _BB_DIR_BIN)
#endif
+#ifdef BB_MSH
+ APPLET_NOUSAGE("msh", msh_main, _BB_DIR_BIN)
+#endif
#ifdef BB_MT
APPLET(mt, mt_main, _BB_DIR_BIN)
#endif
@@ -344,8 +356,14 @@
#ifdef BB_SETKEYCODES
APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
#endif
-#ifdef BB_SH
- APPLET(sh, shell_main, _BB_DIR_BIN)
+#ifdef BB_FEATURE_SH_IS_ASH
+ APPLET_NOUSAGE("sh", ash_main, _BB_DIR_BIN)
+#elif defined(BB_FEATURE_SH_IS_HUSH)
+ APPLET_NOUSAGE("sh", hush_main, _BB_DIR_BIN)
+#elif defined(BB_FEATURE_SH_IS_LASH)
+ APPLET_NOUSAGE("sh", lash_main, _BB_DIR_BIN)
+#elif defined(BB_FEATURE_SH_IS_MSH)
+ APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN)
#endif
#ifdef BB_SLEEP
APPLET(sleep, sleep_main, _BB_DIR_BIN)
diff --git a/include/usage.h b/include/usage.h
index 08da42b..13759d2 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1365,12 +1365,12 @@
#define setkeycodes_example_usage \
"$ setkeycodes e030 127\n"
-#define sh_trivial_usage \
+#define lash_trivial_usage \
"[FILE]...\n" \
"or: sh -c command [args]..."
-#define sh_full_usage \
+#define lash_full_usage \
"lash: The BusyBox LAme SHell (command interpreter)"
-#define sh_notes_usage \
+#define lash_notes_usage \
"This command does not yet have proper documentation.\n" \
"\n" \
"Use lash just as you would use any other shell. It properly handles pipes,\n" \