[svn-commits] jrose: trunk r309859 - in /trunk: ./ apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Mar  7 16:16:33 2011
New Revision: 309859

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

................
  r309858 | jrose | 2011-03-07 16:07:25 -0600 (Mon, 07 Mar 2011) | 22 lines
  
  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:
    trunk/   (props changed)
    trunk/apps/app_mixmonitor.c

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

Modified: trunk/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=309859&r1=309858&r2=309859
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Mon Mar  7 16:16:33 2011
@@ -280,6 +280,7 @@
 	struct ast_filestream **fs = NULL;
 	unsigned int oflags;
 	char *ext;
+	char *last_slash;
 	int errflag = 0;
 	struct ast_format format_slin;
 
@@ -313,7 +314,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";