summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai2001-08-09 21:00:15 +0000
committerMatt Kraai2001-08-09 21:00:15 +0000
commitd0b5be6da872097f46d66b21ec9557c264c7966a (patch)
tree52a9beafe6c2d9b6b57d01bd22103ff0f774c39e
parent2338d3176bdb6fb607a8ce81534e88522d8c516c (diff)
downloadbusybox-d0b5be6da872097f46d66b21ec9557c264c7966a.zip
busybox-d0b5be6da872097f46d66b21ec9557c264c7966a.tar.gz
Remove BB_SH define entirely.
-rw-r--r--Config.h4
-rw-r--r--chroot.c2
-rw-r--r--coreutils/chroot.c2
-rw-r--r--debian/Config.h-deb4
-rw-r--r--debian/Config.h-static4
-rw-r--r--debian/Config.h-udeb4
6 files changed, 2 insertions, 18 deletions
diff --git a/Config.h b/Config.h
index b0b57b0..1e9e550 100644
--- a/Config.h
+++ b/Config.h
@@ -462,15 +462,11 @@
#endif
//
#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
# define shell_main ash_main
#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
# define shell_main hush_main
#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
# define shell_main lash_main
#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
# define shell_main msh_main
#endif
diff --git a/chroot.c b/chroot.c
index 0440e46..de6a2ea 100644
--- a/chroot.c
+++ b/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
prog = *argv;
execvp(*argv, argv);
} else {
-#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL
+#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
char shell[] = "/bin/sh";
char *shell_argv[2] = { shell, NULL };
applet_name = shell;
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 0440e46..de6a2ea 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
prog = *argv;
execvp(*argv, argv);
} else {
-#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL
+#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
char shell[] = "/bin/sh";
char *shell_argv[2] = { shell, NULL };
applet_name = shell;
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 892ce13..fd848e1 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -459,15 +459,11 @@
#endif
//
#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
# define shell_main ash_main
#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
# define shell_main hush_main
#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
# define shell_main lash_main
#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
# define shell_main msh_main
#endif
diff --git a/debian/Config.h-static b/debian/Config.h-static
index 71f6df0..094b1f9 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -459,15 +459,11 @@
#endif
//
#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
# define shell_main ash_main
#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
# define shell_main hush_main
#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
# define shell_main lash_main
#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
# define shell_main msh_main
#endif
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 51446ff..8e7594d 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -459,15 +459,11 @@
#endif
//
#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define BB_SH
# define shell_main ash_main
#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define BB_SH
# define shell_main hush_main
#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define BB_SH
# define shell_main lash_main
#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define BB_SH
# define shell_main msh_main
#endif