From 4ad0ddf5e3132ac11b0e7bcde386fa8aa3c2757a Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Mon, 7 Mar 2011 22:07:25 +0000
Subject: [PATCH] Merged revisions 309857 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

................
  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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@309858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_mixmonitor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index ca3a23991b..26ebd14c5f 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -280,6 +280,7 @@ static void *mixmonitor_thread(void *obj)
 	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 @@ static void *mixmonitor_thread(void *obj)
 				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";