[asterisk-commits] tilghman: branch 1.6.0 r115417 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue May  6 14:33:14 2008
New Revision: 115417

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115417
Log:
Merged revisions 115416 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115416 | tilghman | 2008-05-06 14:32:29 -0500 (Tue, 06 May 2008) | 10 lines

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

........
r115415 | tilghman | 2008-05-06 14:31:39 -0500 (Tue, 06 May 2008) | 2 lines

Don't print the terminating NUL.  (Closes issue #12589)

........

................

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

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

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=115417&r1=115416&r2=115417
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Tue May  6 14:33:14 2008
@@ -2454,7 +2454,7 @@
 				/* Skip verbose lines */
 				if (*curline != 127) {
 					not_written = 0;
-					write(STDOUT_FILENO, curline, nextline - curline + (*nextline == '\0' ? 1 : 0));
+					write(STDOUT_FILENO, curline, nextline - curline);
 				}
 				curline = nextline;
 			} while (!ast_strlen_zero(curline));