[asterisk-commits] jpeeler: branch 1.6.1 r235943 - in /branches/1.6.1: ./ res/res_monitor.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Mon Dec 21 13:55:25 2009
New Revision: 235943

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235943
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_monitor.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_monitor.c?view=diff&rev=235943&r1=235942&r2=235943
==============================================================================
--- branches/1.6.1/res/res_monitor.c (original)
+++ branches/1.6.1/res/res_monitor.c Mon Dec 21 13:55:25 2009
@@ -176,8 +176,8 @@
 						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",