diff options
author | Mark Spencer <markster@digium.com> | 2005-09-25 16:58:56 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-09-25 16:58:56 +0000 |
commit | 9804f96c0f9aa59055e547f384bd4d02189e6e1b (patch) | |
tree | e77e59f75d077c4ad1bbfad947269b9986dca09a /manager.c | |
parent | fcc0b23e180802ddb8f704d1165d27d84718b345 (diff) |
Fix manager EINTR issue (bug #5247)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'manager.c')
-rwxr-xr-x | manager.c | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -1311,17 +1311,22 @@ static int get_input(struct mansession *s, char *output) } fds[0].fd = s->fd; fds[0].events = POLLIN; - res = poll(fds, 1, -1); - if (res < 0) { - ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno)); - return -1; - } else if (res > 0) { - ast_mutex_lock(&s->lock); - res = read(s->fd, s->inbuf + s->inlen, sizeof(s->inbuf) - 1 - s->inlen); - ast_mutex_unlock(&s->lock); - if (res < 1) - return -1; - } + do { + res = poll(fds, 1, -1); + if (res < 0) { + if (errno == EINTR) + continue; + ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno)); + return -1; + } else if (res > 0) { + ast_mutex_lock(&s->lock); + res = read(s->fd, s->inbuf + s->inlen, sizeof(s->inbuf) - 1 - s->inlen); + ast_mutex_unlock(&s->lock); + if (res < 1) + return -1; + break; + } + } while(1); s->inlen += res; s->inbuf[s->inlen] = '\0'; return 0; |