[git commit] ash: main: Print \n upon EOF (CTRL-D) when run interactively

Denys Vlasenko vda.linux at googlemail.com
Sun Feb 16 18:16:52 UTC 2020

commit: https://git.busybox.net/busybox/commit/?id=226b8a143d5632180bef05f728bb497b8318294f
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Upstream comment:

    Date: Fri, 7 Sep 2018 10:34:14 +0200
    main: Print \n upon EOF (CTRL-D) when run interactively

    Exiting dash via a ^D instead of with "exit" causes dash to forget to
    print a newline.

        sh-3.1$ sh
        sh-3.1$ ^D
        sh-3.1$ dash
        $ sh-3.1$

    It is more neat and tidy to send a newline similarly to what bash does,
    so it doesn't make the next prompt of the parent shell look ugly.

    Suggested by jidanni.

    Signed-off-by: Gerrit Pape <pape at smarden.org>
    Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
    [reworded the patch description]
    Signed-off-by: Andrej Shadura <andrew.shadura at collabora.co.uk>
    Bug-Debian: http://bugs.debian.org/476422
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
 shell/ash.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shell/ash.c b/shell/ash.c
index 138f19abd..3958db123 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13302,8 +13302,12 @@ cmdloop(int top)
 			if (!top || numeof >= 50)
 			if (!stoppedjobs()) {
-				if (!Iflag)
+				if (!Iflag) {
+					if (iflag) {
+						newline_and_flush(stderr);
+					}
+				}
 				out2str("\nUse \"exit\" to leave shell.\n");

More information about the busybox-cvs mailing list