[svn-commits] tilghman: trunk r115416 - in /trunk: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May  6 14:32:29 2008
New Revision: 115416

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115416
Log:
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:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=115416&r1=115415&r2=115416
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue May  6 14:32:29 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));