From ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 13 Jun 2007 12:27:17 +0000
Subject: *: 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
---
shell/ash.c | 10 +++++-----
shell/hush.c | 2 +-
shell/lash.c | 4 ++--
shell/msh.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'shell')
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)
#if !ENABLE_FEATURE_SH_EXTRA_QUIET
if (is_interactive > 1) {
/* Looks like they want an interactive shell */
- static smallint do_banner;
+ static smallint did_banner;
- if (!do_banner) {
+ if (!did_banner) {
out1fmt(
"\n\n"
- "%s Built-in shell (ash)\n"
+ "%s built-in shell (ash)\n"
"Enter 'help' for a list of built-in commands."
"\n\n",
- BB_BANNER);
- do_banner = 1;
+ bb_banner);
+ did_banner = 1;
}
}
#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)
hush_exit(xfunc_error_retval);
}
#if !ENABLE_FEATURE_SH_EXTRA_QUIET
- printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", BB_BANNER);
+ printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", bb_banner);
printf("Enter 'help' for a list of built-in commands.\n\n");
#endif
}
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)
if (opt & LASH_OPT_i) {
/* Looks like they want an interactive shell */
if (!ENABLE_FEATURE_SH_EXTRA_QUIET) {
- printf("\n\n%s Built-in shell (lash)\n"
+ printf("\n\n%s built-in shell (lash)\n"
"Enter 'help' for a list of built-in commands.\n\n",
- BB_BANNER);
+ bb_banner);
}
} else if (!local_pending_command && argv[optind]) {
//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 @@
# define bb_dev_null "/dev/null"
# define DEFAULT_SHELL "/proc/self/exe"
# define CONFIG_BUSYBOX_EXEC_PATH "/proc/self/exe"
-# define BB_BANNER "busybox standalone"
+# define bb_banner "busybox standalone"
# define ENABLE_FEATURE_SH_STANDALONE 0
# define bb_msg_memory_exhausted "memory exhausted"
# define xmalloc(size) malloc(size)
@@ -5315,9 +5315,9 @@ int msh_main(int argc, char **argv)
interactive++;
#if !ENABLE_FEATURE_SH_EXTRA_QUIET
#ifdef MSHDEBUG
- printf("\n\n%s Built-in shell (msh with debug)\n", BB_BANNER);
+ printf("\n\n%s built-in shell (msh with debug)\n", bb_banner);
#else
- printf("\n\n%s Built-in shell (msh)\n", BB_BANNER);
+ 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
--
cgit v1.2.3-55-g6feb