<!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][15977] </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=15977">15977</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-15 17:05:49 -0600 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>more tab completion cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_consoleh">freeswitch/trunk/src/include/switch_console.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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="freeswitchtrunksrcincludeswitch_consoleh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_console.h (15976 => 15977)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_console.h 2009-12-15 21:34:27 UTC (rev 15976)
+++ freeswitch/trunk/src/include/switch_console.h 2009-12-15 23:05:49 UTC (rev 15977)
</span><span class="lines">@@ -85,7 +85,9 @@
</span><span class="cx"> const char *last_word, switch_console_callback_match_t **matches);
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val);
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t **matches);
</span><del>-SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *last_word, FILE *console_out, switch_stream_handle_t *stream, switch_xml_t xml);
</del><ins>+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *last_word,
+ FILE *console_out, switch_stream_handle_t *stream, switch_xml_t xml);
+SWITCH_DECLARE(void) switch_console_sort_matches(switch_console_callback_match_t *matches);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15976 => 15977)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-12-15 21:34:27 UTC (rev 15976)
+++ freeswitch/trunk/src/include/switch_types.h 2009-12-15 23:05:49 UTC (rev 15977)
</span><span class="lines">@@ -1494,6 +1494,7 @@
</span><span class="cx"> struct switch_console_callback_match {
</span><span class="cx"> struct switch_console_callback_match_node *head;
</span><span class="cx"> struct switch_console_callback_match_node *end;
</span><ins>+ int count;
</ins><span class="cx"> int dynamic;
</span><span class="cx"> };
</span><span class="cx"> typedef struct switch_console_callback_match switch_console_callback_match_t;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15976 => 15977)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-15 21:34:27 UTC (rev 15976)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-15 23:05:49 UTC (rev 15977)
</span><span class="lines">@@ -3698,7 +3698,7 @@
</span><span class="cx"> dup = strdup(line);
</span><span class="cx"> argc = switch_split(dup, ' ', argv);
</span><span class="cx">
</span><del>- if (!argv[2]) {
</del><ins>+ if (zstr(argv[2]) || !strcmp(argv[2], " ")) {
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_console.c (15976 => 15977)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-12-15 21:34:27 UTC (rev 15976)
+++ freeswitch/trunk/src/switch_console.c 2009-12-15 23:05:49 UTC (rev 15977)
</span><span class="lines">@@ -422,9 +422,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!zstr(target) && *target == ':' && *(target+1) == ':') {
</span><del>- char *r_argv[3] = { 0 }, *r_cols[3] = { 0 };
</del><ins>+ char *r_argv[1] = { 0 }, *r_cols[1] = { 0 };
</ins><span class="cx"> switch_console_callback_match_t *matches;
</span><del>- r_cols[0] = "match";
</del><span class="cx"> if (switch_console_run_complete_func(target, str, cur, &matches) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_console_callback_match_node_t *m;
</span><span class="cx"> for (m = matches->head; m; m = m->next) {
</span><span class="lines">@@ -529,7 +528,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out, switch_stream_handle_t *stream, switch_xml_t xml)
</del><ins>+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out,
+ switch_stream_handle_t *stream, switch_xml_t xml)
</ins><span class="cx"> {
</span><span class="cx"> switch_cache_db_handle_t *db = NULL;
</span><span class="cx"> char *sql = NULL;
</span><span class="lines">@@ -573,6 +573,7 @@
</span><span class="cx"> if (*p == ' ') {
</span><span class="cx"> lp = p;
</span><span class="cx"> h.words++;
</span><ins>+ while(*p == ' ') p++;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1131,6 +1132,58 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void) switch_console_sort_matches(switch_console_callback_match_t *matches)
+{
+ switch_console_callback_match_node_t *p = NULL, *sort[4] = { 0 };
+ int i, j;
+
+ switch_assert(matches);
+
+ if (matches->count < 2) {
+ return;
+ }
+
+ for(i = 1; i < matches->count; i++) {
+ sort[0] = NULL;
+ sort[1] = matches->head;
+ sort[2] = sort[1] ? sort[1]->next : NULL;
+ sort[3] = sort[2] ? sort[2]->next : NULL;
+
+ for(j = 1; j <= (matches->count - i); j++) {
+ if (strcmp(sort[1]->val, sort[2]->val) > 0) {
+ sort[1]->next = sort[3];
+ sort[2]->next = sort[1];
+
+ if (sort[0]) sort[0]->next = sort[2];
+ if (sort[1] == matches->head) matches->head = sort[2];
+
+
+
+
+ sort[0] = sort[2];
+ sort[2] = sort[1]->next;
+ if (sort[3] && sort[3]->next) sort[3] = sort[3]->next;
+
+ } else {
+ sort[0] = sort[1];
+ sort[1] = sort[2];
+ sort[2] = sort[3];
+ if (sort[3] && sort[3]->next) sort[3] = sort[3]->next;
+ }
+
+ }
+ }
+
+ p = matches->head;
+
+ for(i = 1; i < matches->count; i++) p = p->next;
+
+ if (p) {
+ p->next = NULL;
+ matches->end = p;
+ }
+}
+
</ins><span class="cx"> SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val)
</span><span class="cx"> {
</span><span class="cx"> switch_console_callback_match_node_t *match;
</span><span class="lines">@@ -1149,6 +1202,8 @@
</span><span class="cx"> (*matches)->head = match;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ (*matches)->count++;
+
</ins><span class="cx"> (*matches)->end = match;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1160,7 +1215,9 @@
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(globals.func_mutex);
</span><span class="cx"> if ((cb = (switch_console_complete_callback_t)(intptr_t)switch_core_hash_find(globals.func_hash, func))) {
</span><del>- status = cb(line, last_word, matches);
</del><ins>+ if ((status = cb(line, last_word, matches)) == SWITCH_STATUS_SUCCESS) {
+ switch_console_sort_matches(*matches);
+ }
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(globals.func_mutex);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>