<!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][15959] </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=15959">15959</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-14 18:34:02 -0600 (Mon, 14 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>almost lost most of my code</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 (15958 => 15959)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-12-15 00:28:59 UTC (rev 15958)
+++ freeswitch/trunk/src/switch_console.c 2009-12-15 00:34:02 UTC (rev 15959)
</span><span class="lines">@@ -361,144 +361,6 @@
</span><span class="cx"> fflush(handle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct match_helper {
- switch_console_callback_match_t *my_matches;
-};
-
-static int uuid_callback(void *pArg, int argc, char **argv, char **columnNames)
-{
- struct match_helper *h = (struct match_helper *) pArg;
-
- switch_console_push_match(&h->my_matches, argv[0]);
- return 0;
-
-}
-
-SWITCH_DECLARE(switch_status_t) switch_console_list_uuid(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- char *sql;
- struct match_helper h = { 0 };
- switch_cache_db_handle_t *db = NULL;
- switch_status_t status = SWITCH_STATUS_FALSE;
- char *errmsg;
-
- switch_core_db_handle(&db);
-
- if (!zstr(cursor)) {
- sql = switch_mprintf("select distinct uuid from channels where uuid like '%q%%' and hostname='%q' order by uuid",
- cursor, switch_core_get_variable("hostname"));
- } else {
- sql = switch_mprintf("select distinct uuid from channels where hostname='%q' order by uuid",
- switch_core_get_variable("hostname"));
- }
-
- switch_cache_db_execute_sql_callback(db, sql, uuid_callback, &h, &errmsg);
- free(sql);
-
- switch_cache_db_release_db_handle(&db);
-
- if (h.my_matches) {
- *matches = h.my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
-
-
- return status;
-}
-
-
-static struct {
- switch_hash_t *func_hash;
- switch_mutex_t *func_mutex;
-} globals;
-
-SWITCH_DECLARE(switch_status_t) switch_console_init(switch_memory_pool_t *pool)
-{
- switch_mutex_init(&globals.func_mutex, SWITCH_MUTEX_NESTED, pool);
- switch_core_hash_init(&globals.func_hash, pool);
- switch_console_add_complete_func("::console::list_uuid", switch_console_list_uuid);
- return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_DECLARE(switch_status_t) switch_console_shutdown(void)
-{
- return switch_core_hash_destroy(&globals.func_hash);
-}
-
-SWITCH_DECLARE(switch_status_t) switch_console_add_complete_func(const char *name, switch_console_complete_callback_t cb)
-{
- switch_status_t status;
-
- switch_mutex_lock(globals.func_mutex);
- status = switch_core_hash_insert(globals.func_hash, name, (void *)(intptr_t)cb);
- switch_mutex_unlock(globals.func_mutex);
-
- return status;
-}
-
-SWITCH_DECLARE(switch_status_t) switch_console_del_complete_func(const char *name)
-{
- switch_status_t status;
-
- switch_mutex_lock(globals.func_mutex);
- status = switch_core_hash_insert(globals.func_hash, name, NULL);
- switch_mutex_unlock(globals.func_mutex);
-
- return status;
-}
-
-SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t **matches)
-{
- switch_console_callback_match_t *my_match = *matches;
- switch_console_callback_match_node_t *m, *cur;
-
- /* Don't play with matches */
- *matches = NULL;
-
- m = my_match->head;
- while(m) {
- cur = m;
- m = m->next;
- free(cur->val);
- free(cur);
- }
-}
-
-SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val)
-{
- switch_console_callback_match_node_t *match;
-
- if (!*matches) {
- switch_zmalloc(*matches, sizeof(**matches));
- }
-
- switch_zmalloc(match, sizeof(*match));
- match->val = strdup(new_val);
-
- if ((*matches)->head) {
- (*matches)->end->next = match;
- } else {
- (*matches)->head = match;
- }
-
- (*matches)->end = match;
-}
-
-SWITCH_DECLARE(switch_status_t) switch_console_run_complete_func(const char *func, const char *line, const char *cursor,
- switch_console_callback_match_t **matches)
-{
- switch_console_complete_callback_t cb;
- switch_status_t status = SWITCH_STATUS_FALSE;
-
- switch_mutex_lock(globals.func_mutex);
- if ((cb = (switch_console_complete_callback_t)(intptr_t)switch_core_hash_find(globals.func_hash, func))) {
- status = cb(line, cursor, matches);
- }
- switch_mutex_unlock(globals.func_mutex);
-
- return status;
-}
-
</del><span class="cx"> static char hostname[256] = "";
</span><span class="cx"> static int32_t running = 1;
</span><span class="cx">
</span><span class="lines">@@ -644,12 +506,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> struct helper {
</span><ins>+ EditLine *el;
</ins><span class="cx"> int len;
</span><span class="cx"> int hits;
</span><span class="cx"> int words;
</span><span class="cx"> char last[512];
</span><span class="cx"> char partial[512];
</span><span class="cx"> FILE *out;
</span><ins>+ switch_stream_handle_t *stream;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static int comp_callback(void *pArg, int argc, char **argv, char **columnNames)
</span><span class="lines">@@ -692,7 +556,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!zstr(target)) {
</span><del>- fprintf(h->out, "[%20s]\t", target);
</del><ins>+ if (h->out) {
+ fprintf(h->out, "[%20s]\t", target);
+ }
+ if (h->stream) {
+ h->stream->write_function(h->stream, "[%20s]\t", target);
+ }
+
</ins><span class="cx"> switch_copy_string(h->last, target, sizeof(h->last));
</span><span class="cx"> h->hits++;
</span><span class="cx"> }
</span><span class="lines">@@ -713,7 +583,12 @@
</span><span class="cx">
</span><span class="cx"> if (!zstr(target)) {
</span><span class="cx"> if ((h->hits % 4) == 0) {
</span><del>- fprintf(h->out, "\n");
</del><ins>+ if (h->out) {
+ fprintf(h->out, "\n");
+ }
+ if (h->stream) {
+ h->stream->write_function(h->stream, "\n");
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -721,26 +596,73 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static unsigned char complete(EditLine * el, int ch)
</del><ins>+
+struct match_helper {
+ switch_console_callback_match_t *my_matches;
+};
+
+static int uuid_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><ins>+ struct match_helper *h = (struct match_helper *) pArg;
+
+ switch_console_push_match(&h->my_matches, argv[0]);
+ return 0;
+
+}
+
+SWITCH_DECLARE(switch_status_t) switch_console_list_uuid(const char *line, const char *cursor, switch_console_callback_match_t **matches)
+{
+ char *sql;
+ struct match_helper h = { 0 };
</ins><span class="cx"> switch_cache_db_handle_t *db = NULL;
</span><ins>+ switch_status_t status = SWITCH_STATUS_FALSE;
+ char *errmsg;
+
+ switch_core_db_handle(&db);
+
+ if (!zstr(cursor)) {
+ sql = switch_mprintf("select distinct uuid from channels where uuid like '%q%%' and hostname='%q' order by uuid",
+ cursor, switch_core_get_variable("hostname"));
+ } else {
+ sql = switch_mprintf("select distinct uuid from channels where hostname='%q' order by uuid",
+ switch_core_get_variable("hostname"));
+ }
+
+ switch_cache_db_execute_sql_callback(db, sql, uuid_callback, &h, &errmsg);
+ free(sql);
+
+ switch_cache_db_release_db_handle(&db);
+
+ if (h.my_matches) {
+ *matches = h.my_matches;
+ status = SWITCH_STATUS_SUCCESS;
+ }
+
+
+ return status;
+}
+
+
+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out, switch_stream_handle_t *stream)
+{
+ switch_cache_db_handle_t *db = NULL;
</ins><span class="cx"> char *sql = NULL;
</span><del>- const LineInfo *lf = el_line(el);
- char *dup = strdup(lf->buffer);
</del><ins>+ char *dup = strdup(line);
</ins><span class="cx"> char *buf = dup;
</span><span class="cx"> char *p, *lp = NULL;
</span><span class="cx"> char *errmsg = NULL;
</span><del>- struct helper h = { 0 };
</del><ins>+ struct helper h = { el };
</ins><span class="cx"> unsigned char ret = CC_REDISPLAY;
</span><span class="cx"> int pos = 0;
</span><span class="cx">
</span><span class="cx"> switch_core_db_handle(&db);
</span><span class="cx">
</span><del>- if (!zstr(lf->cursor) && !zstr(lf->buffer)) {
- pos = (lf->cursor - lf->buffer);
</del><ins>+ if (!zstr(cursor) && !zstr(line)) {
+ pos = (cursor - line);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- h.out = switch_core_get_console();
</del><ins>+ h.out = console_out;
+ h.stream = stream;
</ins><span class="cx">
</span><span class="cx"> if (pos > 0) {
</span><span class="cx"> *(buf + pos) = '\0';
</span><span class="lines">@@ -767,8 +689,14 @@
</span><span class="cx">
</span><span class="cx"> h.len = strlen(buf);
</span><span class="cx">
</span><del>- fprintf(h.out, "\n\n");
</del><ins>+ if (h.out) {
+ fprintf(h.out, "\n\n");
+ }
</ins><span class="cx">
</span><ins>+ if (h.stream) {
+ h.stream->write_function(h.stream, "\n\n");
+ }
+
</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">@@ -845,20 +773,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- fprintf(h.out, "\n\n");
</del><ins>+ if (h.out) {
+ fprintf(h.out, "\n\n");
+ }
+
+ if (h.stream) {
+ h.stream->write_function(h.stream, "\n\n");
+ if (h.hits == 1 && !zstr(h.last)) {
+ h.stream->write_function(h.stream, "write=%d:%s ", h.len, h.last);
+ } else if (h.hits > 1 && !zstr(h.partial)) {
+ h.stream->write_function(h.stream, "write=%d:%s", h.len, h.partial);
+ }
+ }
</ins><span class="cx">
</span><del>- if (h.hits == 1 && !zstr(h.last)) {
- el_deletestr(el, h.len);
- el_insertstr(el, h.last);
- el_insertstr(el, " ");
- } else if (h.hits > 1 && !zstr(h.partial)) {
- el_deletestr(el, h.len);
- el_insertstr(el, h.partial);
</del><ins>+ if (h.out) {
+ if (h.hits == 1 && !zstr(h.last)) {
+ el_deletestr(el, h.len);
+ el_insertstr(el, h.last);
+ el_insertstr(el, " ");
+ } else if (h.hits > 1 && !zstr(h.partial)) {
+ el_deletestr(el, h.len);
+ el_insertstr(el, h.partial);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx">
</span><del>- fflush(h.out);
</del><ins>+ if (h.out) {
+ fflush(h.out);
+ }
</ins><span class="cx">
</span><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> switch_safe_free(dup);
</span><span class="lines">@@ -868,7 +811,106 @@
</span><span class="cx"> return (ret);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static unsigned char complete(EditLine * el, int ch)
+{
+ const LineInfo *lf = el_line(el);
</ins><span class="cx">
</span><ins>+ return switch_console_complete(lf->buffer, lf->cursor, switch_core_get_console(), NULL);
+}
+
+static struct {
+ switch_hash_t *func_hash;
+ switch_mutex_t *func_mutex;
+} globals;
+
+SWITCH_DECLARE(switch_status_t) switch_console_init(switch_memory_pool_t *pool)
+{
+ switch_mutex_init(&globals.func_mutex, SWITCH_MUTEX_NESTED, pool);
+ switch_core_hash_init(&globals.func_hash, pool);
+ switch_console_add_complete_func("::console::list_uuid", switch_console_list_uuid);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_console_shutdown(void)
+{
+ return switch_core_hash_destroy(&globals.func_hash);
+}
+
+SWITCH_DECLARE(switch_status_t) switch_console_add_complete_func(const char *name, switch_console_complete_callback_t cb)
+{
+ switch_status_t status;
+
+ switch_mutex_lock(globals.func_mutex);
+ status = switch_core_hash_insert(globals.func_hash, name, (void *)(intptr_t)cb);
+ switch_mutex_unlock(globals.func_mutex);
+
+ return status;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_console_del_complete_func(const char *name)
+{
+ switch_status_t status;
+
+ switch_mutex_lock(globals.func_mutex);
+ status = switch_core_hash_insert(globals.func_hash, name, NULL);
+ switch_mutex_unlock(globals.func_mutex);
+
+ return status;
+}
+
+SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t **matches)
+{
+ switch_console_callback_match_t *my_match = *matches;
+ switch_console_callback_match_node_t *m, *cur;
+
+ /* Don't play with matches */
+ *matches = NULL;
+
+ m = my_match->head;
+ while(m) {
+ cur = m;
+ m = m->next;
+ free(cur->val);
+ free(cur);
+ }
+}
+
+SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val)
+{
+ switch_console_callback_match_node_t *match;
+
+ if (!*matches) {
+ switch_zmalloc(*matches, sizeof(**matches));
+ }
+
+ switch_zmalloc(match, sizeof(*match));
+ match->val = strdup(new_val);
+
+ if ((*matches)->head) {
+ (*matches)->end->next = match;
+ } else {
+ (*matches)->head = match;
+ }
+
+ (*matches)->end = match;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_console_run_complete_func(const char *func, const char *line, const char *last_word,
+ switch_console_callback_match_t **matches)
+{
+ switch_console_complete_callback_t cb;
+ switch_status_t status = SWITCH_STATUS_FALSE;
+
+ switch_mutex_lock(globals.func_mutex);
+ if ((cb = (switch_console_complete_callback_t)(intptr_t)switch_core_hash_find(globals.func_hash, func))) {
+ status = cb(line, last_word, matches);
+ }
+ switch_mutex_unlock(globals.func_mutex);
+
+ return status;
+}
+
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)
</span><span class="cx"> {
</span><span class="cx"> char *mydata = NULL, *argv[11] = { 0 };
</span><span class="lines">@@ -1120,9 +1162,8 @@
</span><span class="cx">
</span><span class="cx"> char cmd[2048] = "";
</span><span class="cx"> int32_t activity = 1;
</span><del>- int x = 0;
</del><span class="cx"> gethostname(hostname, sizeof(hostname));
</span><del>-
</del><ins>+
</ins><span class="cx"> while (running) {
</span><span class="cx"> int32_t arg;
</span><span class="cx"> #ifdef _MSC_VER
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>