[svn-commits] jrose: branch 1.4 r309856 - /branches/1.4/apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Mar  7 16:02:12 2011
New Revision: 309856

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309856
Log:
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.4/apps/app_mixmonitor.c

Modified: branches/1.4/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_mixmonitor.c?view=diff&rev=309856&r1=309855&r2=309856
==============================================================================
--- branches/1.4/apps/app_mixmonitor.c (original)
+++ branches/1.4/apps/app_mixmonitor.c Mon Mar  7 16:02:12 2011
@@ -244,6 +244,7 @@
 	struct ast_filestream **fs = NULL;
 	unsigned int oflags;
 	char *ext;
+	char *last_slash;
 	int errflag = 0;
 
 	if (option_verbose > 1)
@@ -277,7 +278,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";