<!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][15903] </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=15903">15903</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-10 23:14:23 -0600 (Thu, 10 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixup completion some more</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_consolec">freeswitch/trunk/src/switch_console.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_console.c (15902 => 15903)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-12-11 04:18:10 UTC (rev 15902)
+++ freeswitch/trunk/src/switch_console.c 2009-12-11 05:14:23 UTC (rev 15903)
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> static unsigned char complete(EditLine * el, int ch)
</span><span class="cx"> {
</span><span class="cx"> switch_cache_db_handle_t *db = NULL;
</span><del>- char *sql;
</del><ins>+ char *sql = NULL;
</ins><span class="cx"> const LineInfo *lf = el_line(el);
</span><span class="cx"> char *dup = strdup(lf->buffer);
</span><span class="cx"> char *buf = dup;
</span><span class="lines">@@ -568,11 +568,20 @@
</span><span class="cx"> char *errmsg = NULL;
</span><span class="cx"> struct helper h = { el };
</span><span class="cx"> unsigned char ret = CC_REDISPLAY;
</span><ins>+ int pos = 0;
</ins><span class="cx">
</span><span class="cx"> switch_core_db_handle(&db);
</span><del>-
</del><ins>+
+ if (!zstr(lf->cursor) && !zstr(lf->buffer)) {
+ pos = (lf->cursor - lf->buffer);
+ }
+
</ins><span class="cx"> h.out = switch_core_get_console();
</span><span class="cx">
</span><ins>+ if (pos > 0) {
+ *(buf + pos) = '\0';
+ }
+
</ins><span class="cx"> if ((p = strchr(buf, '\r')) || (p = strchr(buf, '\n'))) {
</span><span class="cx"> *p = '\0';
</span><span class="cx"> }
</span><span class="lines">@@ -593,27 +602,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> h.len = strlen(buf);
</span><del>-
</del><ins>+
</ins><span class="cx"> fprintf(h.out, "\n\n");
</span><span class="cx">
</span><span class="cx"> if (h.words == 0) {
</span><span class="cx"> sql = switch_mprintf("select distinct name from interfaces where type='api' and name like '%q%%' and hostname='%q' order by name",
</span><span class="cx"> buf, switch_core_get_variable("hostname"));
</span><del>- } else {
</del><ins>+ } else if (h.words == 1) {
</ins><span class="cx"> sql = switch_mprintf("select distinct uuid from channels where uuid like '%q%%' and hostname='%q' order by uuid",
</span><span class="cx"> buf, switch_core_get_variable("hostname"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_cache_db_execute_sql_callback(db, sql, comp_callback, &h, &errmsg);
</del><ins>+ if (sql) {
+ switch_cache_db_execute_sql_callback(db, sql, comp_callback, &h, &errmsg);
</ins><span class="cx">
</span><del>- if (errmsg) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", sql, errmsg);
- free(errmsg);
- ret = CC_ERROR;
- goto end;
</del><ins>+ if (errmsg) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", sql, errmsg);
+ free(errmsg);
+ ret = CC_ERROR;
+ goto end;
+ }
+ free(sql);
+ sql = NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (h.hits != 1) {
</del><ins>+ if (h.hits != -1) {
</ins><span class="cx"> char *dupdup = strdup(dup);
</span><span class="cx"> int x, argc = 0;
</span><span class="cx"> char *argv[10] = { 0 };
</span><span class="lines">@@ -648,9 +661,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stream.write_function(&stream, " and hostname='%s'", switch_core_get_variable("hostname"));
</span><del>-
</del><span class="cx"> switch_cache_db_execute_sql_callback(db, stream.data, comp_callback, &h, &errmsg);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (errmsg) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error [%s][%s]\n", (char *) stream.data, errmsg);
</span><span class="cx"> free(errmsg);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>