From: Brett Bryant <bbryant@digium.com>
Date: Wed, 27 Jun 2007 23:30:31 +0000 (+0000)
Subject: Merged revisions 72383 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a17e7a01a3864490be81ef8ba705ce741b237f54;p=thirdparty%2Fasterisk.git

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

................
r72383 | bbryant | 2007-06-27 18:29:14 -0500 (Wed, 27 Jun 2007) | 11 lines

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

........
r72373 | bbryant | 2007-06-27 18:22:13 -0500 (Wed, 27 Jun 2007) | 3 lines

Reinstating patch. This actually fixes the problem, however I was running a development branch without it and mistakenly thought it wasn't fixed.
Fixes issue #10010, and #9654: 100% CPU usage caused by an asterisk console losing it's controlling terminal.

........

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


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

diff --git a/main/asterisk.c b/main/asterisk.c
index 6a826bf01a..eb5654ab48 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2232,6 +2232,9 @@ static void ast_remotecontrol(char * data)
 	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';
@@ -2958,6 +2961,9 @@ int main(int argc, char *argv[])
 		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';
@@ -2980,5 +2986,6 @@ int main(int argc, char *argv[])
 
 	monitor_sig_flags(NULL);
 
+lostterm:
 	return 0;
 }