aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-08-09 21:00:15 +0000
committerMatt Kraai <kraai@debian.org>2001-08-09 21:00:15 +0000
commitd0b5be6da872097f46d66b21ec9557c264c7966a (patch)
tree52a9beafe6c2d9b6b57d01bd22103ff0f774c39e
parent2338d3176bdb6fb607a8ce81534e88522d8c516c (diff)
downloadbusybox-w32-d0b5be6da872097f46d66b21ec9557c264c7966a.tar.gz
busybox-w32-d0b5be6da872097f46d66b21ec9557c264c7966a.tar.bz2
busybox-w32-d0b5be6da872097f46d66b21ec9557c264c7966a.zip
Remove BB_SH define entirely.
Diffstat
-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 b0b57b04e..1e9e5500c 100644
--- a/Config.h
+++ b/Config.h
@@ -462,15 +462,11 @@
462#endif 462#endif
463// 463//
464#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH 464#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
465# define BB_SH
466# define shell_main ash_main 465# define shell_main ash_main
467#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH 466#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
468# define BB_SH
469# define shell_main hush_main 467# define shell_main hush_main
470#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH 468#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
471# define BB_SH
472# define shell_main lash_main 469# define shell_main lash_main
473#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH 470#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
474# define BB_SH
475# define shell_main msh_main 471# define shell_main msh_main
476#endif 472#endif
diff --git a/chroot.c b/chroot.c
index 0440e46b9..de6a2ea50 100644
--- a/chroot.c
+++ b/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
48 prog = *argv; 48 prog = *argv;
49 execvp(*argv, argv); 49 execvp(*argv, argv);
50 } else { 50 } else {
51#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL 51#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
52 char shell[] = "/bin/sh"; 52 char shell[] = "/bin/sh";
53 char *shell_argv[2] = { shell, NULL }; 53 char *shell_argv[2] = { shell, NULL };
54 applet_name = shell; 54 applet_name = shell;
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 0440e46b9..de6a2ea50 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv)
48 prog = *argv; 48 prog = *argv;
49 execvp(*argv, argv); 49 execvp(*argv, argv);
50 } else { 50 } else {
51#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL 51#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL
52 char shell[] = "/bin/sh"; 52 char shell[] = "/bin/sh";
53 char *shell_argv[2] = { shell, NULL }; 53 char *shell_argv[2] = { shell, NULL };
54 applet_name = shell; 54 applet_name = shell;
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 892ce1303..fd848e192 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -459,15 +459,11 @@
459#endif 459#endif
460// 460//
461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH 461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
462# define BB_SH
463# define shell_main ash_main 462# define shell_main ash_main
464#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH 463#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
465# define BB_SH
466# define shell_main hush_main 464# define shell_main hush_main
467#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH 465#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
468# define BB_SH
469# define shell_main lash_main 466# define shell_main lash_main
470#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH 467#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
471# define BB_SH
472# define shell_main msh_main 468# define shell_main msh_main
473#endif 469#endif
diff --git a/debian/Config.h-static b/debian/Config.h-static
index 71f6df0d0..094b1f9b4 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -459,15 +459,11 @@
459#endif 459#endif
460// 460//
461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH 461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
462# define BB_SH
463# define shell_main ash_main 462# define shell_main ash_main
464#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH 463#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
465# define BB_SH
466# define shell_main hush_main 464# define shell_main hush_main
467#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH 465#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
468# define BB_SH
469# define shell_main lash_main 466# define shell_main lash_main
470#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH 467#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
471# define BB_SH
472# define shell_main msh_main 468# define shell_main msh_main
473#endif 469#endif
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 51446ff89..8e7594dc4 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -459,15 +459,11 @@
459#endif 459#endif
460// 460//
461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH 461#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
462# define BB_SH
463# define shell_main ash_main 462# define shell_main ash_main
464#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH 463#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
465# define BB_SH
466# define shell_main hush_main 464# define shell_main hush_main
467#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH 465#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
468# define BB_SH
469# define shell_main lash_main 466# define shell_main lash_main
470#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH 467#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
471# define BB_SH
472# define shell_main msh_main 468# define shell_main msh_main
473#endif 469#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 15:47:05 +0000