mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-20 20:44:20 +00:00
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/branches/1.2@72373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1816,6 +1816,9 @@ static void ast_remotecontrol(char * data)
|
|||||||
for(;;) {
|
for(;;) {
|
||||||
ebuf = (char *)el_gets(el, &num);
|
ebuf = (char *)el_gets(el, &num);
|
||||||
|
|
||||||
|
if (!ebuf && write(1, "", 1) < 0)
|
||||||
|
break;
|
||||||
|
|
||||||
if (!ast_strlen_zero(ebuf)) {
|
if (!ast_strlen_zero(ebuf)) {
|
||||||
if (ebuf[strlen(ebuf)-1] == '\n')
|
if (ebuf[strlen(ebuf)-1] == '\n')
|
||||||
ebuf[strlen(ebuf)-1] = '\0';
|
ebuf[strlen(ebuf)-1] = '\0';
|
||||||
@@ -2458,6 +2461,9 @@ int main(int argc, char *argv[])
|
|||||||
for (;;) {
|
for (;;) {
|
||||||
buf = (char *)el_gets(el, &num);
|
buf = (char *)el_gets(el, &num);
|
||||||
|
|
||||||
|
if (!buf && write(1, "", 1) < 0)
|
||||||
|
goto lostterm;
|
||||||
|
|
||||||
if (buf) {
|
if (buf) {
|
||||||
if (buf[strlen(buf)-1] == '\n')
|
if (buf[strlen(buf)-1] == '\n')
|
||||||
buf[strlen(buf)-1] = '\0';
|
buf[strlen(buf)-1] = '\0';
|
||||||
@@ -2482,5 +2488,6 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
monitor_sig_flags(NULL);
|
monitor_sig_flags(NULL);
|
||||||
|
|
||||||
|
lostterm:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user