[asterisk-commits] russell: trunk r80470 - in /trunk: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Aug 23 10:52:08 2007
New Revision: 80470

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80470
Log:
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 ...

........

Modified:
    trunk/   (props changed)
    trunk/res/res_agi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_agi.c?view=diff&rev=80470&r1=80469&r2=80470
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Thu Aug 23 10:52:08 2007
@@ -1902,14 +1902,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 != AST_PBX_KEEPALIVE)
 					returnstatus = -1;
@@ -1920,8 +1915,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;