[svn-commits] tilghman: trunk r290577 - in /trunk: ./ main/file.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Oct  6 08:50:33 2010
New Revision: 290577

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290577
Log:
Merged revisions 290576 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r290576 | tilghman | 2010-10-06 08:49:19 -0500 (Wed, 06 Oct 2010) | 15 lines
  
  Merged revisions 290575 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r290575 | tilghman | 2010-10-06 08:48:27 -0500 (Wed, 06 Oct 2010) | 8 lines
    
    Allow streaming audio from a pipe.
    
    (closes issue #18001)
     Reported by: jamicque
     Patches: 
           20100926__issue18001.diff.txt uploaded by tilghman (license 14)
     Tested by: jamicque
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/file.c

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

Modified: trunk/main/file.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/file.c?view=diff&rev=290577&r1=290576&r2=290577
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Oct  6 08:50:33 2010
@@ -961,10 +961,12 @@
 	 * done this way because there is no where for ast_openstream_full to
 	 * return the file had no data. */
 	seekattempt = fseek(fs->f, -1, SEEK_END);
-	if (!seekattempt)
+	if (seekattempt && errno == EINVAL) {
+		/* Zero-length file, as opposed to a pipe */
+		return 0;
+	} else {
 		ast_seekstream(fs, 0, SEEK_SET);
-	else
-		return 0;
+	}
 
 	vfs = ast_openvstream(chan, filename, preflang);
 	if (vfs) {