From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 23 Aug 2007 15:49:28 +0000 (+0000)
Subject: Revert res_agi fix that didn't quite work until we get it right ...
X-Git-Tag: 1.4.12~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa1bc2a13b0f5701861b3f73781e374ba8e627cc;p=thirdparty%2Fasterisk.git

Revert res_agi fix that didn't quite work until we get it right ...


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@80469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_agi.c b/res/res_agi.c
index d0ae408173..c442768aad 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1866,14 +1866,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 = -1;
@@ -1885,8 +1880,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;