[svn-commits] jrose: branch 1.6.2 r309857 - in /branches/1.6.2: ./ apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Mar  7 16:04:44 2011
New Revision: 309857

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309857
Log:
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.6.2/   (props changed)
    branches/1.6.2/apps/app_mixmonitor.c

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

Modified: branches/1.6.2/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_mixmonitor.c?view=diff&rev=309857&r1=309856&r2=309857
==============================================================================
--- branches/1.6.2/apps/app_mixmonitor.c (original)
+++ branches/1.6.2/apps/app_mixmonitor.c Mon Mar  7 16:04:44 2011
@@ -283,6 +283,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);
@@ -314,7 +315,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";