[svn-commits] jpeeler: trunk r235941 - in /trunk: ./ res/res_monitor.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Dec 21 13:54:20 2009
New Revision: 235941

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235941
Log:
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:
    trunk/   (props changed)
    trunk/res/res_monitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_monitor.c?view=diff&rev=235941&r1=235940&r2=235941
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Mon Dec 21 13:54:20 2009
@@ -315,8 +315,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",