[svn-commits] russell: branch 1.6.1 r203823 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Jun 26 16:26:50 2009
New Revision: 203823

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203823
Log:
Merged revisions 203802 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203802 | russell | 2009-06-26 16:21:48 -0500 (Fri, 26 Jun 2009) | 22 lines
  
  Merged revisions 203785 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203785 | russell | 2009-06-26 16:16:39 -0500 (Fri, 26 Jun 2009) | 15 lines
    
    Don't fast forward past the end of a message.
    
    This is nice change for users of the voicemail application.  If someone gets a
    little carried away with fast forwarding through a message, they can easily
    get to the end and accidentally exit the voicemail application by hitting the
    fast forward key during the following prompt.
    
    This adds some safety by not allowing a fast forward past the end of a message.
    
    (closes issue #14554)
    Reported by: lacoursj
    Patches:
          21761.patch uploaded by lacoursj (license 707)
    Tested by: lacoursj
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/file.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/file.c?view=diff&rev=203823&r1=203822&r2=203823
==============================================================================
--- branches/1.6.1/main/file.c (original)
+++ branches/1.6.1/main/file.c Fri Jun 26 16:26:50 2009
@@ -1227,7 +1227,14 @@
 				} else {
 					res = fr->subclass;
 					if (strchr(forward, res)) {
+						int eoftest;
 						ast_stream_fastforward(c->stream, skip_ms);
+						eoftest = fgetc(c->stream->f);
+						if (feof(c->stream->f)) {
+							ast_stream_rewind(c->stream, skip_ms);
+						} else {
+							ungetc(eoftest, c->stream->f);
+						}
 					} else if (strchr(reverse, res)) {
 						ast_stream_rewind(c->stream, skip_ms);
 					} else if (strchr(breakon, res)) {