diff options
author | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-02-16 15:40:24 +0000 |
---|---|---|
committer | vodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-02-16 15:40:24 +0000 |
commit | 8da02146489cd5b8d049f2369b20842794d74e06 (patch) | |
tree | 311c032dd6a55cc3923e744d8e888d9edd9ede44 /shell | |
parent | d353f302c51b2f326830ca17bd7dcaf6a68b3421 (diff) | |
download | busybox-w32-8da02146489cd5b8d049f2369b20842794d74e06.tar.gz busybox-w32-8da02146489cd5b8d049f2369b20842794d74e06.tar.bz2 busybox-w32-8da02146489cd5b8d049f2369b20842794d74e06.zip |
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
git-svn-id: svn://busybox.net/trunk/busybox@14080 69ca8d6d-28ef-0310-b511-8ec308f3f277
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) | |||
11833 | 11833 | ||
11834 | if(!do_banner) { | 11834 | if(!do_banner) { |
11835 | out1fmt( | 11835 | out1fmt( |
11836 | "\n\n" BB_BANNER " Built-in shell (ash)\n" | 11836 | "\n\n%s Built-in shell (ash)\n" |
11837 | "Enter 'help' for a list of built-in commands.\n\n"); | 11837 | "Enter 'help' for a list of built-in commands.\n\n", |
11838 | BB_BANNER); | ||
11838 | do_banner++; | 11839 | do_banner++; |
11839 | } | 11840 | } |
11840 | } | 11841 | } |
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 @@ | |||
104 | #include "standalone.h" | 104 | #include "standalone.h" |
105 | #define hush_main main | 105 | #define hush_main main |
106 | #undef CONFIG_FEATURE_SH_FANCY_PROMPT | 106 | #undef CONFIG_FEATURE_SH_FANCY_PROMPT |
107 | #define BB_BANNER | 107 | #define BB_BANNER "" |
108 | #endif | 108 | #endif |
109 | #define SPECIAL_VAR_SYMBOL 03 | 109 | #define SPECIAL_VAR_SYMBOL 03 |
110 | #define FLAG_EXIT_FROM_LOOP 1 | 110 | #define FLAG_EXIT_FROM_LOOP 1 |
@@ -2812,7 +2812,8 @@ int hush_main(int argc, char **argv) | |||
2812 | if (interactive) { | 2812 | if (interactive) { |
2813 | /* Looks like they want an interactive shell */ | 2813 | /* Looks like they want an interactive shell */ |
2814 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET | 2814 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET |
2815 | printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n"); | 2815 | printf( "\n\n%s hush - the humble shell v0.01 (testing)\n", |
2816 | BB_BANNER); | ||
2816 | printf( "Enter 'help' for a list of built-in commands.\n\n"); | 2817 | printf( "Enter 'help' for a list of built-in commands.\n\n"); |
2817 | #endif | 2818 | #endif |
2818 | setup_job_control(); | 2819 | 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) | |||
1661 | //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]); | 1661 | //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]); |
1662 | /* Looks like they want an interactive shell */ | 1662 | /* Looks like they want an interactive shell */ |
1663 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET | 1663 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET |
1664 | printf( "\n\n" BB_BANNER " Built-in shell (lash)\n"); | 1664 | printf( "\n\n%s Built-in shell (lash)\n", BB_BANNER); |
1665 | printf( "Enter 'help' for a list of built-in commands.\n\n"); | 1665 | printf( "Enter 'help' for a list of built-in commands.\n\n"); |
1666 | #endif | 1666 | #endif |
1667 | } else if (local_pending_command==NULL) { | 1667 | } 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) | |||
956 | interactive++; | 956 | interactive++; |
957 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET | 957 | #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET |
958 | #ifdef MSHDEBUG | 958 | #ifdef MSHDEBUG |
959 | printf("\n\n" BB_BANNER " Built-in shell (msh with debug)\n"); | 959 | printf("\n\n%s Built-in shell (msh with debug)\n", BB_BANNER); |
960 | #else | 960 | #else |
961 | printf("\n\n" BB_BANNER " Built-in shell (msh)\n"); | 961 | printf("\n\n%s Built-in shell (msh)\n", BB_BANNER); |
962 | #endif | 962 | #endif |
963 | printf("Enter 'help' for a list of built-in commands.\n\n"); | 963 | printf("Enter 'help' for a list of built-in commands.\n\n"); |
964 | #endif | 964 | #endif |