From c34c033c4256f88e759c5f7a59526b4397852a82 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 29 Sep 2009 12:25:30 +0200 Subject: ash,hush: share string function old new delta optschanged 133 139 +6 hush_main 997 982 -15 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 6/-15) Total: -9 bytes text data bss dec hexfilename 823160 445 7668 831273 caf29busybox_old 823102 445 7668 831215 caeefbusybox_unstripped Signed-off-by: Denys Vlasenko --- shell/ash.c | 9 +++++---- shell/hush.c | 11 +++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/shell/ash.c b/shell/ash.c index 952961373..e5503a140 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -8539,12 +8539,13 @@ setinteractive(int on) static smallint did_banner; if (!did_banner) { - out1fmt( - "\n\n" - "%s built-in shell (ash)\n" + /* note: ash and hush share this string */ + out1fmt("\n\n%s %s\n" "Enter 'help' for a list of built-in commands." "\n\n", - bb_banner); + bb_banner, + "built-in shell (ash)" + ); did_banner = 1; } } diff --git a/shell/hush.c b/shell/hush.c index b515eabd2..3012a1f73 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -6816,10 +6816,13 @@ int hush_main(int argc, char **argv) */ if (!ENABLE_FEATURE_SH_EXTRA_QUIET && G_interactive_fd) { - printf("\n\n%s hush - the humble shell\n", bb_banner); - if (ENABLE_HUSH_HELP) - puts("Enter 'help' for a list of built-in commands."); - puts(""); + /* note: ash and hush share this string */ + printf("\n\n%s %s\n" + IF_HUSH_HELP("Enter 'help' for a list of built-in commands.\n") + "\n", + bb_banner, + "hush - the humble shell" + ); } parse_and_run_file(stdin); -- cgit v1.2.3