diff options
| author | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-07 22:16:33 +0000 |
|---|---|---|
| committer | jrose <jrose@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-07 22:16:33 +0000 |
| commit | 8d040672b51eff29943d4e41e67d6e9234aacb78 (patch) | |
| tree | 97b5afefaf42ee78b65c804b65e97fe045365bc8 | |
| parent | 3221925681b45866a20c31325b2649dac02c4e5b (diff) | |
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
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@309859 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_mixmonitor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 63454895f..910e72cb1 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; struct ast_format format_slin; @@ -313,7 +314,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"; |