Merged revisions 266592 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r266592 | tilghman | 2010-06-01 10:18:59 -0500 (Tue, 01 Jun 2010) | 18 lines

  Merged revisions 266585 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r266585 | tilghman | 2010-06-01 10:17:46 -0500 (Tue, 01 Jun 2010) | 11 lines

    Prevent CLI prompt from distorting output of lines shorter than the prompt.

    Uses the VT100 method of clearing the line from the cursor position to the
    end of the line:  Esc-0K

    (closes issue #17160)
     Reported by: coolmig
     Patches:
           20100531__issue17160.diff.txt uploaded by tilghman (license 14)
     Tested by: coolmig
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@266598 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/asterisk.c b/main/asterisk.c
index 5f37fc03e9963dfdeb081ae4e2468de9a32222d7..0d71c2a058ab4de7b406082d154e16fc13655355 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2167,7 +2167,7 @@ static int ast_el_read_char(EditLine *editline, char *cp)
 
                        /* Write over the CLI prompt */
                        if (!ast_opt_exec && !lastpos) {
-                               if (write(STDOUT_FILENO, "\r", 1) < 0) {
+                               if (write(STDOUT_FILENO, "\r\e[0K", 5) < 0) {
                                }
                        }
                        if (write(STDOUT_FILENO, buf, res) < 0) {