<!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][14958] </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=14958">14958</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-09-23 12:32:01 -0500 (Wed, 23 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> <a href="http://jira.freeswitch.org/browse/FSCORE-446">FSCORE-446</a> </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_utilsh">freeswitch/trunk/src/include/switch_utils.h</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec">freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.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_utilsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_utils.h (14957 => 14958)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_utils.h 2009-09-23 17:04:39 UTC (rev 14957)
+++ freeswitch/trunk/src/include/switch_utils.h 2009-09-23 17:32:01 UTC (rev 14958)
</span><span class="lines">@@ -545,6 +545,13 @@
</span><span class="cx"> SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace);
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len);
</span><span class="cx">
</span><ins>+/*!
+ \brief Quote shell argument
+ \param string the string to quote (example: a ' b"' c)
+ \return the quoted string (gives: 'a '\'' b"'\'' c' for unices, "a ' b ' c" for MS Windows)
+*/
+SWITCH_DECLARE(char *) switch_util_quote_shell_arg(const char *string);
+
</ins><span class="cx"> #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK)
</span><span class="cx"> SWITCH_DECLARE(size_t) switch_url_encode(const char *url, char *buf, size_t len);
</span><span class="cx"> SWITCH_DECLARE(char *) switch_url_decode(char *s);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c (14957 => 14958)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-23 17:04:39 UTC (rev 14957)
+++ freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-23 17:32:01 UTC (rev 14958)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><del>-SWITCH_DECLARE(char *) switch_escape_shell_arg(char *string);
-
</del><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_tts_commandline_load);
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tts_commandline_shutdown);
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_tts_commandline, mod_tts_commandline_load, mod_tts_commandline_shutdown, NULL);
</span><span class="lines">@@ -56,62 +54,6 @@
</span><span class="cx"> typedef struct tts_commandline_data tts_commandline_t;
</span><span class="cx">
</span><span class="cx">
</span><del>-SWITCH_DECLARE(char *) switch_quote_shell_arg(char *string)
-{
- size_t string_len = strlen(string);
- size_t i;
- size_t n = 0;
- size_t dest_len = string_len + 1; /* +1 for the opening quote */
- char *dest, *tmp;
-
- dest = (char *) malloc(sizeof(char) * dest_len);
- switch_assert(dest);
-
-#ifdef WIN32
- dest[n++] = '"';
-#else
- dest[n++] = '\'';
-#endif
-
- for (i = 0; i < string_len; i++) {
- switch (string[i]) {
-#ifdef WIN32
- case '"':
- case '%':
- dest[n++] = ' ';
- break;
-#else
- case '\'':
- /* We replace ' by '\'' */
- dest_len+=3;
- tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
- switch_assert(tmp);
- dest = tmp;
- dest[n++] = '\'';
- dest[n++] = '\\';
- dest[n++] = '\'';
- dest[n++] = '\'';
- break;
-#endif
- default:
- dest[n++] = string[i];
- }
- }
-
- dest_len += 2; /* +2 for the closing quote and the null character */
- tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
- switch_assert(tmp);
- dest = tmp;
-#ifdef WIN32
- dest[n++] = '"';
-#else
- dest[n++] = '\'';
-#endif
- dest[n++] = 0;
- switch_assert(n == dest_len);
- return dest;
-}
-
</del><span class="cx"> static int load_tts_commandline_config(void)
</span><span class="cx"> {
</span><span class="cx"> char *cf = "tts_commandline.conf";
</span><span class="lines">@@ -190,16 +132,16 @@
</span><span class="cx">
</span><span class="cx"> message = switch_core_strdup(sh->memory_pool, globals.command);
</span><span class="cx">
</span><del>- tmp = switch_quote_shell_arg(text);
</del><ins>+ tmp = switch_util_quote_shell_arg(text);
</ins><span class="cx"> message = switch_string_replace(message, "${text}", tmp);
</span><span class="cx">
</span><del>- tmp = switch_quote_shell_arg(info->voice_name);
</del><ins>+ tmp = switch_util_quote_shell_arg(info->voice_name);
</ins><span class="cx"> message = switch_string_replace(message, "${voice}", tmp);
</span><span class="cx">
</span><span class="cx"> rate = switch_core_sprintf(sh->memory_pool, "%d", info->rate);
</span><span class="cx"> message = switch_string_replace(message, "${rate}", rate);
</span><span class="cx">
</span><del>- tmp = switch_quote_shell_arg(info->file);
</del><ins>+ tmp = switch_util_quote_shell_arg(info->file);
</ins><span class="cx"> message = switch_string_replace(message, "${file}", tmp);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing: %s\n", message);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_utilsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_utils.c (14957 => 14958)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_utils.c 2009-09-23 17:04:39 UTC (rev 14957)
+++ freeswitch/trunk/src/switch_utils.c 2009-09-23 17:32:01 UTC (rev 14958)
</span><span class="lines">@@ -1661,6 +1661,62 @@
</span><span class="cx"> return dest;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(char *) switch_util_quote_shell_arg(const char *string)
+{
+ size_t string_len = strlen(string);
+ size_t i;
+ size_t n = 0;
+ size_t dest_len = string_len + 1; /* +1 for the opening quote */
+ char *dest, *tmp;
+
+ dest = (char *) malloc(sizeof(char) * dest_len);
+ switch_assert(dest);
+
+#ifdef WIN32
+ dest[n++] = '"';
+#else
+ dest[n++] = '\'';
+#endif
+
+ for (i = 0; i < string_len; i++) {
+ switch (string[i]) {
+#ifdef WIN32
+ case '"':
+ case '%':
+ dest[n++] = ' ';
+ break;
+#else
+ case '\'':
+ /* We replace ' by '\'' */
+ dest_len+=3;
+ tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
+ switch_assert(tmp);
+ dest = tmp;
+ dest[n++] = '\'';
+ dest[n++] = '\\';
+ dest[n++] = '\'';
+ dest[n++] = '\'';
+ break;
+#endif
+ default:
+ dest[n++] = string[i];
+ }
+ }
+
+ dest_len += 2; /* +2 for the closing quote and the null character */
+ tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
+ switch_assert(tmp);
+ dest = tmp;
+#ifdef WIN32
+ dest[n++] = '"';
+#else
+ dest[n++] = '\'';
+#endif
+ dest[n++] = 0;
+ switch_assert(n == dest_len);
+ return dest;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
</span><span class="cx"> {
</span><span class="cx"> int nsds = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>