mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
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/branches/1.2@28754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1803,13 +1803,17 @@ static void ast_remotecontrol(char * data)
|
|||||||
|
|
||||||
if (option_exec && data) { /* hack to print output then exit if asterisk -rx is used */
|
if (option_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(;;) {
|
||||||
|
Reference in New Issue
Block a user