diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-08-23 15:52:08 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-08-23 15:52:08 +0000 |
| commit | 84643967e1fbf520df8bf8cc447f39556647cc7f (patch) | |
| tree | 759b4afbe9b06914da2974fcd02c4757d530b11f /res | |
| parent | ed9306ba4281d3cd4cdc2a28b2bb391684bab43b (diff) | |
Merged revisions 80469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80469 | russell | 2007-08-23 10:49:28 -0500 (Thu, 23 Aug 2007) | 2 lines
Revert res_agi fix that didn't quite work until we get it right ...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index fffbc93fc..d356156d3 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1902,14 +1902,9 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi ast_frfree(f); } } else if (outfd > -1) { - size_t len; retry = RETRY; buf[0] = '\0'; -retry_fgets: - len = strlen(buf); - if (!fgets(buf + len, sizeof(buf) - len, readf)) { - if (!feof(readf) && (errno == EINTR || errno == EAGAIN)) - goto retry_fgets; + if (!fgets(buf, sizeof(buf), readf)) { /* Program terminated */ if (returnstatus && returnstatus != AST_PBX_KEEPALIVE) returnstatus = -1; @@ -1920,8 +1915,6 @@ retry_fgets: pid = -1; break; } - if (errno == EINTR || errno == EAGAIN) - goto retry_fgets; /* get rid of trailing newline, if any */ if (*buf && buf[strlen(buf) - 1] == '\n') buf[strlen(buf) - 1] = 0; |