diff options
| author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2006-02-16 15:40:24 +0000 |
|---|---|---|
| committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2006-02-16 15:40:24 +0000 |
| commit | dd1ccddf1b33972966760857092eb9b659b7a40a (patch) | |
| tree | 311c032dd6a55cc3923e744d8e888d9edd9ede44 /shell | |
| parent | 21e68703ce35805ff8b9590c22a400de05155ac2 (diff) | |
| download | busybox-dd1ccddf1b33972966760857092eb9b659b7a40a.tar.gz | |
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
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 5 | ||||
| -rw-r--r-- | shell/hush.c | 5 | ||||
| -rw-r--r-- | shell/lash.c | 2 | ||||
| -rw-r--r-- | shell/msh.c | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c index e9e6def22..9eb395fd9 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -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++; } } diff --git a/shell/hush.c b/shell/hush.c index 8b6cbe7c9..387b6cd7a 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -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(); diff --git a/shell/lash.c b/shell/lash.c index 1b8aca506..968396e41 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -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) { diff --git a/shell/msh.c b/shell/msh.c index d56db5714..375b1266e 100644 --- a/shell/msh.c +++ b/shell/msh.c @@ -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 |