kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 28754 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r28754 | russell | 2006-05-19 15:01:17 -0400 (Fri, 19 May 2006) | 6 lines

This explicit poll is only needed on mac.  In fact, it breaks some systems
such as some versions of Fedora, causing 'asterisk -rx' to never exit.  This
has been tested on systems showing the asterisk -rx problem, as well as other
unaffected versions of linux, mac osx 10.4, and FreeBSD 6.
(issue #7071)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-19 19:04:24 +00:00
parent 9993d14f86
commit 6b73b82e5d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asterisk.c
View File

@@ -2027,13 +2027,17 @@ static void ast_remotecontrol(char * data)
if (ast_opt_exec && data) { /* hack to print output then exit if asterisk -rx is used */ if (ast_opt_exec && data) { /* hack to print output then exit if asterisk -rx is used */
char tempchar; char tempchar;
#ifdef __Darwin__
struct pollfd fds[0]; struct pollfd fds[0];
fds[0].fd = ast_consock; fds[0].fd = ast_consock;
fds[0].events = POLLIN; fds[0].events = POLLIN;
fds[0].revents = 0; fds[0].revents = 0;
while(poll(fds, 1, 100) > 0) { while (poll(fds, 1, 100) > 0) {
ast_el_read_char(el, &tempchar); ast_el_read_char(el, &tempchar);
} }
#else
while (!ast_el_read_char(el, &tempchar));
#endif
return; return;
} }
for (;;) { for (;;) {