<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16517] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16517">16517</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-26 12:20:09 -0600 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>try this Vagabond</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_module_interfacesh">freeswitch/trunk/src/include/switch_module_interfaces.h</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_file_stringmod_file_stringc">freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_play_sayc">freeswitch/trunk/src/switch_ivr_play_say.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_utilsc">freeswitch/trunk/src/switch_utils.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_module_interfacesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_module_interfaces.h (16516 => 16517)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_module_interfaces.h 2010-01-26 15:44:46 UTC (rev 16516)
+++ freeswitch/trunk/src/include/switch_module_interfaces.h 2010-01-26 18:20:09 UTC (rev 16517)
</span><span class="lines">@@ -338,6 +338,7 @@
</span><span class="cx"> int line;
</span><span class="cx"> char *file_path;
</span><span class="cx"> char *spool_path;
</span><ins>+ const char *prefix;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*! \brief Abstract interface to an asr module */
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_file_stringmod_file_stringc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c (16516 => 16517)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c 2010-01-26 15:44:46 UTC (rev 16516)
+++ freeswitch/trunk/src/mod/formats/mod_file_string/mod_file_string.c 2010-01-26 18:20:09 UTC (rev 16517)
</span><span class="lines">@@ -60,7 +60,11 @@
</span><span class="cx"> static int next_file(switch_file_handle_t *handle)
</span><span class="cx"> {
</span><span class="cx"> file_string_context_t *context = handle->private_info;
</span><ins>+ char *file;
+ const char *prefix = handle->prefix;
</ins><span class="cx">
</span><ins>+ top:
+
</ins><span class="cx"> context->index++;
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag((&context->fh), SWITCH_FILE_OPEN)) {
</span><span class="lines">@@ -71,12 +75,25 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+ if (!prefix) {
+ if (!(prefix = switch_core_get_variable("sound_prefix"))) {
+ prefix = SWITCH_GLOBAL_dirs.sounds_dir;
+ }
+ }
+
+ if (!prefix || switch_is_file_path(context->argv[context->index])) {
+ file = context->argv[context->index];
+ } else {
+ file = switch_core_sprintf(handle->memory_pool, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, context->argv[context->index]);
+ }
+
</ins><span class="cx"> if (switch_core_file_open(&context->fh,
</span><del>- context->argv[context->index],
</del><ins>+ file,
</ins><span class="cx"> handle->channels,
</span><span class="cx"> handle->samplerate,
</span><span class="cx"> SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- return 0;
</del><ins>+ goto top;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> handle->samples = context->fh.samples;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_play_sayc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_play_say.c (16516 => 16517)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_play_say.c 2010-01-26 15:44:46 UTC (rev 16516)
+++ freeswitch/trunk/src/switch_ivr_play_say.c 2010-01-26 18:20:09 UTC (rev 16517)
</span><span class="lines">@@ -399,6 +399,13 @@
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> int divisor = 0;
</span><span class="cx"> int file_flags = SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT;
</span><ins>+ const char *prefix;
+
+ prefix = switch_channel_get_variable(channel, "sound_prefix");
+
+ if (!prefix) {
+ prefix = SWITCH_GLOBAL_dirs.sounds_dir;
+ }
</ins><span class="cx">
</span><span class="cx"> switch_core_session_get_read_impl(session, &read_impl);
</span><span class="cx">
</span><span class="lines">@@ -468,14 +475,7 @@
</span><span class="cx">
</span><span class="cx"> if (!strstr(file, SWITCH_URL_SEPARATOR)) {
</span><span class="cx"> char *ext;
</span><del>- const char *prefix;
</del><span class="cx">
</span><del>- prefix = switch_channel_get_variable(channel, "sound_prefix");
-
- if (!prefix) {
- prefix = SWITCH_GLOBAL_dirs.base_dir;
- }
-
</del><span class="cx"> if (!switch_is_file_path(file)) {
</span><span class="cx"> char *tfile = NULL;
</span><span class="cx"> char *e;
</span><span class="lines">@@ -510,7 +510,10 @@
</span><span class="cx"> file_flags |= SWITCH_FILE_WRITE_APPEND;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+ if (!fh->prefix) {
+ fh->prefix = prefix;
+ }
+
</ins><span class="cx"> if (switch_core_file_open(fh,
</span><span class="cx"> file,
</span><span class="cx"> fh->channels,
</span><span class="lines">@@ -1076,6 +1079,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+ if (!fh->prefix) {
+ fh->prefix = prefix;
+ }
+
</ins><span class="cx"> if (switch_core_file_open(fh,
</span><span class="cx"> file,
</span><span class="cx"> read_impl.number_of_channels,
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_utilsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_utils.c (16516 => 16517)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_utils.c 2010-01-26 15:44:46 UTC (rev 16516)
+++ freeswitch/trunk/src/switch_utils.c 2010-01-26 18:20:09 UTC (rev 16517)
</span><span class="lines">@@ -1571,9 +1571,6 @@
</span><span class="cx"> case 's':
</span><span class="cx"> unescaped = ' ';
</span><span class="cx"> break;
</span><del>- case '\\':
- unescaped = 1; /* 1 means double esc */
- break;
</del><span class="cx"> default:
</span><span class="cx"> unescaped = escaped;
</span><span class="cx"> }
</span><span class="lines">@@ -1642,16 +1639,12 @@
</span><span class="cx"> for (start = dest = ptr; *ptr; ++ptr) {
</span><span class="cx"> char e;
</span><span class="cx"> int esc = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (*ptr == ESCAPE_META) {
</span><span class="cx"> e = *(ptr + 1);
</span><del>- if (e == '\'' || e == '"' || (delim && e == delim) || (e = unescape_char(*(ptr + 1))) != *(ptr + 1)) {
</del><ins>+ if (e == '\'' || e == '"' || (delim && e == delim) || e == ESCAPE_META || (e = unescape_char(*(ptr + 1))) != *(ptr + 1)) {
</ins><span class="cx"> ++ptr;
</span><del>- if (e == 1) {
- *dest++ = '\\';
- } else {
- *dest++ = e;
- }
</del><ins>+ *dest++ = e;
</ins><span class="cx"> end = dest;
</span><span class="cx"> esc++;
</span><span class="cx"> }
</span><span class="lines">@@ -1670,6 +1663,7 @@
</span><span class="cx"> if (end) {
</span><span class="cx"> *end = '\0';
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return start;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1727,8 +1721,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /* strip quotes, escaped chars and leading / trailing spaces */
</span><del>- for (i = 0; i < count; ++i) {
- array[i] = cleanup_separated_string(array[i], delim);
</del><ins>+ if (count > 1) {
+ for (i = 0; i < count; ++i) {
+ array[i] = cleanup_separated_string(array[i], delim);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="lines">@@ -1785,8 +1781,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /* strip quotes, escaped chars and leading / trailing spaces */
</span><del>- for (i = 0; i < count; ++i) {
- array[i] = cleanup_separated_string(array[i], 0);
</del><ins>+ if (count > 1) {
+ for (i = 0; i < count; ++i) {
+ array[i] = cleanup_separated_string(array[i], 0);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return count;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>