[svn-commits] jrose: branch 1.8 r309858 - in /branches/1.8: ./ apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Mar  7 16:07:25 2011
New Revision: 309858

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

................
  r309857 | jrose | 2011-03-07 16:04:44 -0600 (Mon, 07 Mar 2011) | 15 lines
  
  Merged revisions 309856 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r309856 | jrose | 2011-03-07 16:02:12 -0600 (Mon, 07 Mar 2011) | 8 lines
    
    Bug fix for MixMonitor involving filenames with '.' not in the extension
    
    Closes issue #18391)
    Reported by: pabelanger
    Patches: 
          bugfix.patch uploaded by jrose (license 1225)
    Tested by: jrose
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_mixmonitor.c

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

Modified: branches/1.8/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_mixmonitor.c?view=diff&rev=309858&r1=309857&r2=309858
==============================================================================
--- branches/1.8/apps/app_mixmonitor.c (original)
+++ branches/1.8/apps/app_mixmonitor.c Mon Mar  7 16:07:25 2011
@@ -280,6 +280,7 @@
 	struct ast_filestream **fs = NULL;
 	unsigned int oflags;
 	char *ext;
+	char *last_slash;
 	int errflag = 0;
 
 	ast_verb(2, "Begin MixMonitor Recording %s\n", mixmonitor->name);
@@ -311,7 +312,8 @@
 				oflags = O_CREAT | O_WRONLY;
 				oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC;
 
-				if ((ext = strrchr(mixmonitor->filename, '.')))
+				last_slash = strrchr(mixmonitor->filename, '/');
+				if ((ext = strrchr(mixmonitor->filename, '.')) && (ext > last_slash))
 					*(ext++) = '\0';
 				else
 					ext = "raw";