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 <vda.linux@googlemail.com>

diff --git a/shell/ash.c b/shell/ash.c
index 9529613730092f1db5cfb2561f1738149b2a4d33..e5503a140a11b286d7722eacc5770965cff5cbae 100644 (file)
--- 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 b515eabd2a485f2c1c6dae41ea296ff456243624..3012a1f73ec1da477bb6bf97d5853dd59ece03d5 100644 (file)
--- 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);