aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-06-13 12:27:17 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-06-13 12:27:17 +0000
commitca525b4f24a1a27ffe5dfc8d04c55227ca335ba0 (patch)
tree8ccf1f528aafeeb00368c41be74900db86d43d14 /shell
parentb51fd3525e48c79ef9e854dd357a9cdfdfeef72b (diff)
downloadbusybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.tar.gz
busybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.tar.bz2
busybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.zip
*: BB_BANNER -> bb_banner (it is not a const or #define)!
correct_password: explain in detail why it is ok to use bb_banner fsck_minix: make it print bb version, not it's own (outdated/irrelevant) one Marginal size difference: text data bss dec hex filename 679119 2700 15632 697451 aa46b busybox_old 679091 2700 15632 697423 aa44f busybox_unstripped
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c10
-rw-r--r--shell/hush.c2
-rw-r--r--shell/lash.c4
-rw-r--r--shell/msh.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 173beb195..35eec42a7 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7737,16 +7737,16 @@ setinteractive(int on)
7737#if !ENABLE_FEATURE_SH_EXTRA_QUIET 7737#if !ENABLE_FEATURE_SH_EXTRA_QUIET
7738 if (is_interactive > 1) { 7738 if (is_interactive > 1) {
7739 /* Looks like they want an interactive shell */ 7739 /* Looks like they want an interactive shell */
7740 static smallint do_banner; 7740 static smallint did_banner;
7741 7741
7742 if (!do_banner) { 7742 if (!did_banner) {
7743 out1fmt( 7743 out1fmt(
7744 "\n\n" 7744 "\n\n"
7745 "%s Built-in shell (ash)\n" 7745 "%s built-in shell (ash)\n"
7746 "Enter 'help' for a list of built-in commands." 7746 "Enter 'help' for a list of built-in commands."
7747 "\n\n", 7747 "\n\n",
7748 BB_BANNER); 7748 bb_banner);
7749 do_banner = 1; 7749 did_banner = 1;
7750 } 7750 }
7751 } 7751 }
7752#endif 7752#endif
diff --git a/shell/hush.c b/shell/hush.c
index e6fa3d9a5..a446bbeb2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3787,7 +3787,7 @@ int hush_main(int argc, char **argv)
3787 hush_exit(xfunc_error_retval); 3787 hush_exit(xfunc_error_retval);
3788 } 3788 }
3789#if !ENABLE_FEATURE_SH_EXTRA_QUIET 3789#if !ENABLE_FEATURE_SH_EXTRA_QUIET
3790 printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", BB_BANNER); 3790 printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", bb_banner);
3791 printf("Enter 'help' for a list of built-in commands.\n\n"); 3791 printf("Enter 'help' for a list of built-in commands.\n\n");
3792#endif 3792#endif
3793 } 3793 }
diff --git a/shell/lash.c b/shell/lash.c
index 21c95fb1b..4e8b23776 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1548,9 +1548,9 @@ int lash_main(int argc_l, char **argv_l)
1548 if (opt & LASH_OPT_i) { 1548 if (opt & LASH_OPT_i) {
1549 /* Looks like they want an interactive shell */ 1549 /* Looks like they want an interactive shell */
1550 if (!ENABLE_FEATURE_SH_EXTRA_QUIET) { 1550 if (!ENABLE_FEATURE_SH_EXTRA_QUIET) {
1551 printf("\n\n%s Built-in shell (lash)\n" 1551 printf("\n\n%s built-in shell (lash)\n"
1552 "Enter 'help' for a list of built-in commands.\n\n", 1552 "Enter 'help' for a list of built-in commands.\n\n",
1553 BB_BANNER); 1553 bb_banner);
1554 } 1554 }
1555 } else if (!local_pending_command && argv[optind]) { 1555 } else if (!local_pending_command && argv[optind]) {
1556 //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]); 1556 //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
diff --git a/shell/msh.c b/shell/msh.c
index dc2fa9c16..2328e0734 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -36,7 +36,7 @@
36# define bb_dev_null "/dev/null" 36# define bb_dev_null "/dev/null"
37# define DEFAULT_SHELL "/proc/self/exe" 37# define DEFAULT_SHELL "/proc/self/exe"
38# define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe" 38# define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe"
39# define BB_BANNER "busybox standalone" 39# define bb_banner "busybox standalone"
40# define ENABLE_FEATURE_SH_STANDALONE 0 40# define ENABLE_FEATURE_SH_STANDALONE 0
41# define bb_msg_memory_exhausted "memory exhausted" 41# define bb_msg_memory_exhausted "memory exhausted"
42# define xmalloc(size) malloc(size) 42# define xmalloc(size) malloc(size)
@@ -5315,9 +5315,9 @@ int msh_main(int argc, char **argv)
5315 interactive++; 5315 interactive++;
5316#if !ENABLE_FEATURE_SH_EXTRA_QUIET 5316#if !ENABLE_FEATURE_SH_EXTRA_QUIET
5317#ifdef MSHDEBUG 5317#ifdef MSHDEBUG
5318 printf("\n\n%s Built-in shell (msh with debug)\n", BB_BANNER); 5318 printf("\n\n%s built-in shell (msh with debug)\n", bb_banner);
5319#else 5319#else
5320 printf("\n\n%s Built-in shell (msh)\n", BB_BANNER); 5320 printf("\n\n%s built-in shell (msh)\n", bb_banner);
5321#endif 5321#endif
5322 printf("Enter 'help' for a list of built-in commands.\n\n"); 5322 printf("Enter 'help' for a list of built-in commands.\n\n");
5323#endif 5323#endif