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

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep 12 10:12:52 2007
New Revision: 82279

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82279
Log:
Merged revisions 82278 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82278 | russell | 2007-09-12 10:11:11 -0500 (Wed, 12 Sep 2007) | 3 lines

revert patch from issue #10553, as someone not using fastagi reported that this
broke their system.

........

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=82279&r1=82278&r2=82279
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Wed Sep 12 10:12:52 2007
@@ -1905,25 +1905,10 @@
 				ast_frfree(f);
 			}
 		} else if (outfd > -1) {
-			size_t len = sizeof(buf);
-			size_t buflen = 0;
-
 			retry = AGI_NANDFS_RETRY;
 			buf[0] = '\0';
 
-			while (buflen < (len - 1)) {
-				fgets(buf + buflen, len, readf);
-				if (feof(readf)) 
-					break;
-				if (ferror(readf) && ((errno != EINTR) && (errno != EAGAIN))) 
-					break;
-				buflen = strlen(buf);
-				len -= buflen;
-				if (agidebug)
-					ast_verbose( "AGI Rx << temp buffer %s - errno %s\n", buf, strerror(errno));
-			}
-
-			if (!buf[0]) {
+			if (!fgets(buf, sizeof(buf), readf)) {
 				/* Program terminated */
 				if (returnstatus && returnstatus != AST_PBX_KEEPALIVE)
 					returnstatus = -1;