Add an option to make the shells not advertise their busybox nature

9 files changed, 25 insertions, 4 deletions

diff --git a/Config.h b/Config.h
index a62e3fb73..73b0f91f8 100644
--- a/Config.h
+++ b/Config.h
@@ -302,6 +302,9 @@
 // Only relevant if a shell is enabled.
 //#define BB_FEATURE_SH_FANCY_PROMPT
 //
+//Make interactive shells not print busybox messages
+//#define BB_FEATURE_SH_EXTRA_QUIET
+//
 //Turn on extra fbset options
 //#define BB_FEATURE_FBSET_FANCY
 //
diff --git a/ash.c b/ash.c
index 5933b1518..486386a25 100644
--- a/ash.c
+++ b/ash.c
@@ -3224,8 +3224,10 @@ setinteractive(int on)
         is_interactive = on;
         if (do_banner==0 && is_interactive) {
                 /* Looks like they want an interactive shell */
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                 printf( "\n\n" BB_BANNER " Built-in shell (ash)\n");
                 printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 do_banner=1;
         }
 }
@@ -12728,7 +12730,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.27 2001/10/19 00:08:17 andersen Exp $
+ * $Id: ash.c,v 1.28 2001/10/19 00:22:22 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {
diff --git a/hush.c b/hush.c
index 0e619f80e..cb0e6e980 100644
--- a/hush.c
+++ b/hush.c
@@ -2655,7 +2655,10 @@ int hush_main(int argc, char **argv)
         debug_printf("\ninteractive=%d\n", interactive);
         if (interactive) {
                 /* Looks like they want an interactive shell */
-                fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
+                printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n");
+                printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 setup_job_control();
         }
         
diff --git a/lash.c b/lash.c
index b3f7cb6a8..ffdec8781 100644
--- a/lash.c
+++ b/lash.c
@@ -1611,8 +1611,10 @@ int lash_main(int argc_l, char **argv_l)
         if (interactive==TRUE) {
                 //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                 /* Looks like they want an interactive shell */
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                 printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
                 printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
         } else if (local_pending_command==NULL) {
                 //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                 input = xfopen(argv[optind], "r");
diff --git a/msh.c b/msh.c
index e16d6f304..5c4ec1019 100644
--- a/msh.c
+++ b/msh.c
@@ -801,8 +801,10 @@ extern int msh_main(int argc, char **argv)
                 PUSHIO(afile, 0, iof);
                 if (isatty(0) && isatty(1) && !cflag) {
                         interactive++;
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                         printf( "\n\n" BB_BANNER " Built-in shell (msh)\n");
                         printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 }
         }
         signal(SIGQUIT, qflag);
diff --git a/shell/ash.c b/shell/ash.c
index 5933b1518..486386a25 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3224,8 +3224,10 @@ setinteractive(int on)
         is_interactive = on;
         if (do_banner==0 && is_interactive) {
                 /* Looks like they want an interactive shell */
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                 printf( "\n\n" BB_BANNER " Built-in shell (ash)\n");
                 printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 do_banner=1;
         }
 }
@@ -12728,7 +12730,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.27 2001/10/19 00:08:17 andersen Exp $
+ * $Id: ash.c,v 1.28 2001/10/19 00:22:22 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {
diff --git a/shell/hush.c b/shell/hush.c
index 0e619f80e..cb0e6e980 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2655,7 +2655,10 @@ int hush_main(int argc, char **argv)
         debug_printf("\ninteractive=%d\n", interactive);
         if (interactive) {
                 /* Looks like they want an interactive shell */
-                fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
+                printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n");
+                printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 setup_job_control();
         }
         
diff --git a/shell/lash.c b/shell/lash.c
index b3f7cb6a8..ffdec8781 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1611,8 +1611,10 @@ int lash_main(int argc_l, char **argv_l)
         if (interactive==TRUE) {
                 //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                 /* Looks like they want an interactive shell */
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                 printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
                 printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
         } else if (local_pending_command==NULL) {
                 //printf( "optind=%d  argv[optind]='%s'\n", optind, argv[optind]);
                 input = xfopen(argv[optind], "r");
diff --git a/shell/msh.c b/shell/msh.c
index e16d6f304..5c4ec1019 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -801,8 +801,10 @@ extern int msh_main(int argc, char **argv)
                 PUSHIO(afile, 0, iof);
                 if (isatty(0) && isatty(1) && !cflag) {
                         interactive++;
+#ifndef BB_FEATURE_SH_EXTRA_QUIET 
                         printf( "\n\n" BB_BANNER " Built-in shell (msh)\n");
                         printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                 }
         }
         signal(SIGQUIT, qflag);