From 41b01e009fa012b240fc1f63b1cf26a8ed779ad6 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 5 Jan 2012 22:10:45 +0000 Subject: [PATCH] Allow playback of formats that don't support seeking ast_streamfile previously did unconditional seeking on files that broke playback of formats that don't support that functionality. This patch avoids the seek that was causing the problem. This regression was introduced in r158062. (closes issue ASTERISK-18994) Patch-by: Timo Teras ........ Merged revisions 349731 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@349732 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/main/file.c b/main/file.c index 1d871fde22..70b971cb3a 100644 --- a/main/file.c +++ b/main/file.c @@ -1012,6 +1012,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p struct ast_filestream *fs; struct ast_filestream *vfs=NULL; char fmt[256]; + off_t pos; int seekattempt; int res; @@ -1024,12 +1025,17 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p /* check to see if there is any data present (not a zero length file), * 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 && errno == EINVAL) { - /* Zero-length file, as opposed to a pipe */ - return 0; + pos = ftello(fs->f); + seekattempt = fseeko(fs->f, -1, SEEK_END); + if (seekattempt) { + if (errno == EINVAL) { + /* Zero-length file, as opposed to a pipe */ + return 0; + } else { + ast_seekstream(fs, 0, SEEK_SET); + } } else { - ast_seekstream(fs, 0, SEEK_SET); + fseeko(fs->f, pos, SEEK_SET); } vfs = ast_openvstream(chan, filename, preflang); -- 2.47.2