moved BB_BANNER to applets/version.c file: make kernel like version,
removed depend loop: busybox.h depend with BB_BT, and all sources depend with busybox.h
This commit is contained in:
+3
-2
@@ -11833,8 +11833,9 @@ setinteractive(int on)
|
||||
|
||||
if(!do_banner) {
|
||||
out1fmt(
|
||||
"\n\n" BB_BANNER " Built-in shell (ash)\n"
|
||||
"Enter 'help' for a list of built-in commands.\n\n");
|
||||
"\n\n%s Built-in shell (ash)\n"
|
||||
"Enter 'help' for a list of built-in commands.\n\n",
|
||||
BB_BANNER);
|
||||
do_banner++;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -104,7 +104,7 @@
|
||||
#include "standalone.h"
|
||||
#define hush_main main
|
||||
#undef CONFIG_FEATURE_SH_FANCY_PROMPT
|
||||
#define BB_BANNER
|
||||
#define BB_BANNER ""
|
||||
#endif
|
||||
#define SPECIAL_VAR_SYMBOL 03
|
||||
#define FLAG_EXIT_FROM_LOOP 1
|
||||
@@ -2812,7 +2812,8 @@ int hush_main(int argc, char **argv)
|
||||
if (interactive) {
|
||||
/* Looks like they want an interactive shell */
|
||||
#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
|
||||
printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n");
|
||||
printf( "\n\n%s hush - the humble shell v0.01 (testing)\n",
|
||||
BB_BANNER);
|
||||
printf( "Enter 'help' for a list of built-in commands.\n\n");
|
||||
#endif
|
||||
setup_job_control();
|
||||
|
||||
+1
-1
@@ -1661,7 +1661,7 @@ int lash_main(int argc_l, char **argv_l)
|
||||
//printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
|
||||
/* Looks like they want an interactive shell */
|
||||
#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
|
||||
printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
|
||||
printf( "\n\n%s Built-in shell (lash)\n", BB_BANNER);
|
||||
printf( "Enter 'help' for a list of built-in commands.\n\n");
|
||||
#endif
|
||||
} else if (local_pending_command==NULL) {
|
||||
|
||||
+2
-2
@@ -956,9 +956,9 @@ extern int msh_main(int argc, char **argv)
|
||||
interactive++;
|
||||
#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
|
||||
#ifdef MSHDEBUG
|
||||
printf("\n\n" BB_BANNER " Built-in shell (msh with debug)\n");
|
||||
printf("\n\n%s Built-in shell (msh with debug)\n", BB_BANNER);
|
||||
#else
|
||||
printf("\n\n" BB_BANNER " Built-in shell (msh)\n");
|
||||
printf("\n\n%s Built-in shell (msh)\n", BB_BANNER);
|
||||
#endif
|
||||
printf("Enter 'help' for a list of built-in commands.\n\n");
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user