<!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][15986] </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=15986">15986</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-17 11:43:40 -0600 (Thu, 17 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>auto remove spaces from tab completion</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslfs_clic">freeswitch/trunk/libs/esl/fs_cli.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_consolec">freeswitch/trunk/src/switch_console.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslfs_clic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/fs_cli.c (15985 => 15986)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/fs_cli.c 2009-12-17 16:53:25 UTC (rev 15985)
+++ freeswitch/trunk/libs/esl/fs_cli.c 2009-12-17 17:43:40 UTC (rev 15986)
</span><span class="lines">@@ -429,17 +429,57 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #ifdef HAVE_EDITLINE
</span><ins>+#define end_of_p(_s) (*_s == '\0' ? _s : _s + strlen(_s) - 1)
</ins><span class="cx">
</span><span class="cx"> static unsigned char complete(EditLine * el, int ch)
</span><span class="cx"> {
</span><span class="cx"> const LineInfo *lf = el_line(el);
</span><span class="cx"> char cmd_str[2048] = "";
</span><span class="cx"> unsigned char ret = CC_REDISPLAY;
</span><ins>+ char *dup = strdup(lf->buffer);
+ char *buf = dup;
+ int pos = 0, sc = 0;
+ char *p;
</ins><span class="cx">
</span><ins>+ if (!esl_strlen_zero(lf->cursor) && !esl_strlen_zero(lf->buffer)) {
+ pos = (lf->cursor - lf->buffer);
+ }
+ if (pos > 0) {
+ *(buf + pos) = '\0';
+ }
+
+ if ((p = strchr(buf, '\r')) || (p = strchr(buf, '\n'))) {
+ *p = '\0';
+ }
+
+ while (*buf == ' ') {
+ buf++;
+ sc++;
+ }
+
+ if (!*buf && sc) {
+ el_deletestr(el, sc);
+ }
+
+ sc = 0;
+
+ p = end_of_p(buf);
+ while(p >= buf && *p == ' ') {
+ sc++;
+ p--;
+ }
+
+ if (sc > 1) {
+ el_deletestr(el, sc - 1);
+ *(p + 2) = '\0';
+ }
+
+
+
</ins><span class="cx"> if (*lf->cursor) {
</span><del>- snprintf(cmd_str, sizeof(cmd_str), "api console_complete c=%ld;%s\n\n", (long int)(lf->cursor - lf->buffer), lf->buffer);
</del><ins>+ snprintf(cmd_str, sizeof(cmd_str), "api console_complete c=%ld;%s\n\n", (long)pos, buf);
</ins><span class="cx"> } else {
</span><del>- snprintf(cmd_str, sizeof(cmd_str), "api console_complete %s\n\n", lf->buffer);
</del><ins>+ snprintf(cmd_str, sizeof(cmd_str), "api console_complete %s\n\n", buf);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> esl_send_recv(global_handle, cmd_str);
</span><span class="lines">@@ -474,6 +514,8 @@
</span><span class="cx"> fflush(stdout);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ esl_safe_free(dup);
+
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_console.c (15985 => 15986)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-12-17 16:53:25 UTC (rev 15985)
+++ freeswitch/trunk/src/switch_console.c 2009-12-17 17:43:40 UTC (rev 15986)
</span><span class="lines">@@ -540,7 +540,8 @@
</span><span class="cx"> struct helper h = { 0 };
</span><span class="cx"> unsigned char ret = CC_REDISPLAY;
</span><span class="cx"> int pos = 0;
</span><del>-
</del><ins>+ int sc = 0;
+
</ins><span class="cx"> #ifndef SWITCH_HAVE_LIBEDIT
</span><span class="cx"> if (!stream) {
</span><span class="cx"> return CC_ERROR;
</span><span class="lines">@@ -566,17 +567,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (*buf == ' ') {
</span><ins>+ sc++;
</ins><span class="cx"> buf++;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!*buf) {
+#ifdef SWITCH_HAVE_LIBEDIT
+ if (h.out && sc) {
+ el_deletestr(el, sc);
+ }
+#endif
+ }
+
+ sc = 0;
+ p = end_of_p(buf);
+ while(p >= buf && *p == ' ') {
+ sc++;
+ p--;
+ }
+
+ if (sc > 1) {
+#ifdef SWITCH_HAVE_LIBEDIT
+ if (h.out) {
+ el_deletestr(el, sc - 1);
+ }
+#endif
+ *(p + 2) = '\0';
+ }
+
</ins><span class="cx"> for (p = buf; p && *p; p++) {
</span><span class="cx"> if (*p == ' ') {
</span><span class="cx"> lp = p;
</span><span class="cx"> h.words++;
</span><span class="cx"> while(*p == ' ') p++;
</span><ins>+ if (!*p) break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (lp) {
</span><span class="cx"> buf = lp + 1;
</span><span class="cx"> }
</span><span class="lines">@@ -591,6 +618,8 @@
</span><span class="cx"> h.stream->write_function(h.stream, "\n\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+
</ins><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><span class="lines">@@ -670,7 +699,7 @@
</span><span class="cx"> if (h.out) {
</span><span class="cx"> fprintf(h.out, "\n\n");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (h.stream) {
</span><span class="cx"> h.stream->write_function(h.stream, "\n\n");
</span><span class="cx"> if (h.hits == 1 && !zstr(h.last)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>