diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 20:46:12 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 20:46:12 +0000 |
commit | 3d0e4f15ee0ef50e0f76af1925653360cf1daae3 (patch) | |
tree | f095467d018fbc9245356365f684862f6ddd7bc3 /main/asterisk.c | |
parent | c9e6bded5edb46a85f77947a9428fe9ba7ac333e (diff) |
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/branches/1.4@72260 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
-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 0c36fda6a..df4b55b72 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2282,6 +2282,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'; @@ -2956,6 +2959,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'; @@ -2978,5 +2985,6 @@ int main(int argc, char *argv[]) monitor_sig_flags(NULL); +lostterm: return 0; } |