Merged revisions 235941 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r235941 | jpeeler | 2009-12-21 13:54:20 -0600 (Mon, 21 Dec 2009) | 20 lines

  Merged revisions 235940 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r235940 | jpeeler | 2009-12-21 13:43:41 -0600 (Mon, 21 Dec 2009) | 13 lines

    Change Monitor to not assume file to write to does not contain pathing.

    227944 changed the fname_base argument to always append the configured monitor
    path. This change was necessary to properly compare files for uniqueness.
    If a full path is given though, nothing needs to be appended and that is
    handled correctly now.

    (closes issue #16377)
    (closes issue #16376)
    Reported by: bcnit
    Patches:
          res_monitor.c-issue16376-1.patch uploaded by dant (license 670)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@235943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_monitor.c b/res/res_monitor.c
index a2388e61f0dd4e49a5c5b8ebee2b478091286fc9..88cd4f7bd0d85d9a3f5519ca9b253c8b63dffb42 100644 (file)
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -176,8 +176,8 @@ int ast_monitor_start(      struct ast_channel *chan, const char *format_spec,
                                                directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
                        snprintf(monitor->write_filename, FILENAME_MAX, "%s%s%s-out",
                                                directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
-                       snprintf(monitor->filename_base, FILENAME_MAX, "%s/%s",
-                                        ast_config_AST_MONITOR_DIR, fname_base);
+                       snprintf(monitor->filename_base, FILENAME_MAX, "%s%s%s",
+                                               directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
                } else {
                        ast_mutex_lock(&monitorlock);
                        snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",