diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 20:47:45 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 20:47:45 +0000 |
commit | 9367a00b386b6d9736563640b6e00342dbee794a (patch) | |
tree | 5b988d7e9dc78d667ebc708495b948de81938bd4 /main | |
parent | 500ed391c5941b0805e3c325ad007377be22cf3f (diff) |
Merged revisions 72260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r72260 | bbryant | 2007-06-27 15:46:12 -0500 (Wed, 27 Jun 2007) | 12 lines
Merged revisions 72259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r72259 | bbryant | 2007-06-27 15:43:53 -0500 (Wed, 27 Jun 2007) | 4 lines
Fixes 100% load when controlling terminal disappears.
Issue #9654, #10010
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@72261 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 2e81f3d91..eb5654ab4 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'; @@ -2957,6 +2960,10 @@ 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'; @@ -2979,5 +2986,6 @@ int main(int argc, char *argv[]) monitor_sig_flags(NULL); +lostterm: return 0; } |