From b8efebf4943262490d73a837c89b24d3d7d13c24 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Wed, 23 Dec 2020 16:21:24 -0500 Subject: Fix multi-line prompts when right prompts are used editline does not render a multi-line PS1 correctly when RPS1 is also set. To work around this, return only the last line of the cached prompt to editline, and print the leading lines separately inside setprompt. --- bin/dash/src/parser.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bin/dash/src/parser.c b/bin/dash/src/parser.c index 21052c21..499f7f8e 100644 --- a/bin/dash/src/parser.c +++ b/bin/dash/src/parser.c @@ -1598,7 +1598,7 @@ STATIC void setprompt(int which) { struct stackmark smark; - const char *prompt, *rprompt; + const char *prompt, *rprompt, *nl; int show; needprompt = 0; @@ -1638,6 +1638,10 @@ setprompt(int which) free(rpromptcache); promptcache = savestr(expandstr(prompt)); rpromptcache = savestr(expandstr(rprompt)); + + nl = strrchr(promptcache, '\n'); + if (nl) + outmem(promptcache, &nl[1] - promptcache, out2); } popstackmark(&smark); } @@ -1648,7 +1652,14 @@ setprompt(int which) const char * getprompt(void *unused) { - return promptcache; + const char *nl; + + nl = strrchr(promptcache, '\n'); + + if (nl) + return &nl[1]; + else + return promptcache; } const char * -- cgit 1.4.1