[asterisk-commits] bbryant: trunk r72337 - in /trunk: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Jun 27 18:04:06 2007
New Revision: 72337

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72337
Log:
Merged revisions 72335 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r72335 | bbryant | 2007-06-27 18:03:01 -0500 (Wed, 27 Jun 2007) | 10 lines

Merged revisions 72333 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r72333 | bbryant | 2007-06-27 17:58:53 -0500 (Wed, 27 Jun 2007) | 2 lines

Reverted changes for earlier revisions 72259 to 72261. Issue #9654, #10010

........

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

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=72337&r1=72336&r2=72337
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Jun 27 18:04:06 2007
@@ -2232,9 +2232,6 @@
 	for (;;) {
 		ebuf = (char *)el_gets(el, &num);
 
-		if (!ebuf && write(1, "", 1) < 0)
-			break;
-
 		if (!ast_strlen_zero(ebuf)) {
 			if (ebuf[strlen(ebuf)-1] == '\n')
 				ebuf[strlen(ebuf)-1] = '\0';
@@ -2961,9 +2958,6 @@
 		for (;;) {
 			buf = (char *)el_gets(el, &num);
 
-			if (!buf && write(1, "", 1) < 0)
-				goto lostterm;
-
 			if (buf) {
 				if (buf[strlen(buf)-1] == '\n')
 					buf[strlen(buf)-1] = '\0';
@@ -2986,6 +2980,5 @@
 
 	monitor_sig_flags(NULL);
 
-lostterm:
 	return 0;
 }