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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@309858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-03-07 22:07:25 +00:00
parent 56cd7709a5
commit 4ad0ddf5e3

View File

@@ -280,6 +280,7 @@ static void *mixmonitor_thread(void *obj)
struct ast_filestream **fs = NULL; struct ast_filestream **fs = NULL;
unsigned int oflags; unsigned int oflags;
char *ext; char *ext;
char *last_slash;
int errflag = 0; int errflag = 0;
ast_verb(2, "Begin MixMonitor Recording %s\n", mixmonitor->name); 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 = O_CREAT | O_WRONLY;
oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC; 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'; *(ext++) = '\0';
else else
ext = "raw"; ext = "raw";