<!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][14931] </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=14931">14931</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2009-09-21 03:48:12 -0500 (Mon, 21 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_tts_commandline: quote shell args, create an unique tempfile</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec">freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 (14930 => 14931)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-20 22:14:52 UTC (rev 14930)
+++ freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-21 08:48:12 UTC (rev 14931)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(char *) switch_escape_shell_arg(char *string);
+
</ins><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">@@ -45,14 +47,71 @@
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_command, globals.command);
</span><span class="cx">
</span><span class="cx"> struct tts_commandline_data {
</span><del>- switch_file_handle_t fh;
</del><ins>+ switch_file_handle_t fh;
</ins><span class="cx"> char *voice_name;
</span><span class="cx"> int rate;
</span><del>- char file[512];
</del><ins>+ char *file;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct tts_commandline_data tts_commandline_t;
</span><span class="cx">
</span><ins>+
+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++;
+tmp = (char *) realloc(dest, sizeof(char) * (dest_len));
+switch_assert(tmp);
+dest = tmp;
+#ifdef WIN32
+ dest[n++] = '"';
+#else
+ dest[n++] = '\'';
+#endif
+
+ dest[dest_len] = 0;
+ return dest;
+}
+
</ins><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">@@ -75,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(globals.command)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No command set, please edit %s\n", cf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No command set, please edit %s\n", cf);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -92,23 +151,31 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t tts_commandline_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, switch_speech_flag_t *flags)
</span><span class="cx"> {
</span><ins>+ switch_uuid_t uuid;
+ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
+ char outfile[512] = "";
+
</ins><span class="cx"> tts_commandline_t *info = switch_core_alloc(sh->memory_pool, sizeof(*info));
</span><span class="cx">
</span><span class="cx"> info->voice_name = switch_core_strdup(sh->memory_pool, voice_name);
</span><del>- info->rate = rate;
</del><ins>+ info->rate = rate;
</ins><span class="cx">
</span><del>- switch_snprintf(info->file, sizeof(info->file), "%s%s.wav", SWITCH_GLOBAL_dirs.temp_dir, "tts_commandline");
-
- sh->private_info = info;
-
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ switch_uuid_get(&uuid);
+ switch_uuid_format(uuid_str, &uuid);
+
+ switch_snprintf(outfile, sizeof(outfile), "%s%s.tmp.wav", SWITCH_GLOBAL_dirs.temp_dir, uuid_str);
+ info->file = outfile;
+
+ sh->private_info = info;
+
+ return SWITCH_STATUS_SUCCESS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t tts_commandline_speech_close(switch_speech_handle_t *sh, switch_speech_flag_t *flags)
</span><span class="cx"> {
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><del>-
</del><ins>+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -117,32 +184,40 @@
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><del>- char *message;
- char *rate;
</del><ins>+ char *message, *tmp, *rate;
+
</ins><span class="cx"> message = switch_core_strdup(sh->memory_pool, globals.command);
</span><del>- message = switch_string_replace(message, "${text}", text);
- message = switch_string_replace(message, "${voice}", info->voice_name);
- rate = switch_core_sprintf(sh->memory_pool, "%d", info->rate);
- message = switch_string_replace(message, "${rate}", rate);
- message = switch_string_replace(message, "${file}", info->file);
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing: %s\n", message);
-
- if (switch_system(message, SWITCH_TRUE) < 0) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to execute command: %s\n", message);
- return SWITCH_STATUS_FALSE;
- }
</del><span class="cx">
</span><del>- if (switch_core_file_open(&info->fh,
- info->file,
- 0, //number_of_channels,
- 0, //samples_per_second,
- SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file: %s\n", info->file);
- return SWITCH_STATUS_FALSE;
- }
-
- sh->private_info = info;
</del><ins>+ tmp = switch_quote_shell_arg(text);
+ message = switch_string_replace(message, "${text}", tmp);
+
+ tmp = switch_quote_shell_arg(info->voice_name);
+ message = switch_string_replace(message, "${voice}", tmp);
+
+ rate = switch_core_sprintf(sh->memory_pool, "%d", info->rate);
+ message = switch_string_replace(message, "${rate}", rate);
+
+ tmp = switch_quote_shell_arg(info->file);
+ message = switch_string_replace(message, "${file}", tmp);
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing: %s\n", message);
+
+ if (switch_system(message, SWITCH_TRUE) < 0) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to execute command: %s\n", message);
+ return SWITCH_STATUS_FALSE;
+ }
</ins><span class="cx">
</span><ins>+ if (switch_core_file_open(&info->fh,
+ info->file,
+ 0, //number_of_channels,
+ 0, //samples_per_second,
+ SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file: %s\n", info->file);
+ return SWITCH_STATUS_FALSE;
+ }
+
+ sh->private_info = info;
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,30 +225,30 @@
</span><span class="cx"> {
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><del>-
- size_t my_datalen = *datalen / 2;
-
- if (switch_core_file_read(&info->fh, data, &my_datalen) != SWITCH_STATUS_SUCCESS) {
- *datalen = my_datalen * 2;
- return SWITCH_STATUS_FALSE;
- }
- *datalen = my_datalen * 2;
- if(datalen == 0) {
- return SWITCH_STATUS_BREAK;
- } else {
- return SWITCH_STATUS_SUCCESS;
- }
</del><ins>+
+ size_t my_datalen = *datalen / 2;
+
+ if (switch_core_file_read(&info->fh, data, &my_datalen) != SWITCH_STATUS_SUCCESS) {
+ *datalen = my_datalen * 2;
+ return SWITCH_STATUS_FALSE;
+ }
+ *datalen = my_datalen * 2;
+ if(datalen == 0) {
+ return SWITCH_STATUS_BREAK;
+ } else {
+ return SWITCH_STATUS_SUCCESS;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_speech_flush_tts(switch_speech_handle_t *sh)
</span><span class="cx"> {
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><del>-
- switch_core_file_close(&info->fh);
- if (unlink(info->file) != 0) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sound file [%s] delete failed\n", info->file);
- }
</del><ins>+
+ switch_core_file_close(&info->fh);
+ if (unlink(info->file) != 0) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sound file [%s] delete failed\n", info->file);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val)
</span><span class="lines">@@ -182,8 +257,8 @@
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(param, "voice")) {
</span><del>- info->voice_name = switch_core_strdup(sh->memory_pool, val);
- }
</del><ins>+ info->voice_name = switch_core_strdup(sh->memory_pool, val);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val)
</span><span class="lines">@@ -197,9 +272,9 @@
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_tts_commandline_load)
</span><span class="cx"> {
</span><span class="cx"> switch_speech_interface_t *speech_interface;
</span><del>-
- load_tts_commandline_config();
</del><span class="cx">
</span><ins>+ load_tts_commandline_config();
+
</ins><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>