[asterisk-commits] tilghman: branch 1.6.2 r266598 - in /branches/1.6.2: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jun  1 10:20:14 2010
New Revision: 266598

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266598
Log:
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
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/asterisk.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=266598&r1=266597&r2=266598
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Tue Jun  1 10:20:14 2010
@@ -2167,7 +2167,7 @@
 
 			/* Write over the CLI prompt */
 			if (!ast_opt_exec && !lastpos) {
-				if (write(STDOUT_FILENO, "\r", 1) < 0) {
+				if (write(STDOUT_FILENO, "\r", 5) < 0) {
 				}
 			}
 			if (write(STDOUT_FILENO, buf, res) < 0) {