[asterisk-commits] russell: branch 1.4 r80469 - /branches/1.4/res/res_agi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Aug 23 10:49:28 2007
New Revision: 80469

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80469
Log:
Revert res_agi fix that didn't quite work until we get it right ...

Modified:
    branches/1.4/res/res_agi.c

Modified: branches/1.4/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_agi.c?view=diff&rev=80469&r1=80468&r2=80469
==============================================================================
--- branches/1.4/res/res_agi.c (original)
+++ branches/1.4/res/res_agi.c Thu Aug 23 10:49:28 2007
@@ -1866,14 +1866,9 @@
 				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 @@
 				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;