kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into smgmaster

Browse Source 
Conflicts:
	build/modules.conf.in
	src/mod/loggers/mod_logfile/mod_logfile.c
This commit is contained in:
Moises Silva
2012-01-31 16:56:29 -05:00
parent 3eef66d6c1 1ad0bc250c
commit 94ceff6842
487 changed files with 108347 additions and 4470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/esl/fs_cli.c
View File

@@ -615,8 +615,7 @@ static void clear_line(void)
static void redisplay(void)
{
#ifdef WIN32
#else
#ifndef WIN32
const LineInfo *lf = el_line(el);
const char *c = lf->buffer;
if (!(write_str(prompt_str))) goto done;
@@ -1114,7 +1113,6 @@ int main(int argc, char *argv[])
char dft_cfile[512] = "nbess7_cli.conf";
#endif
char *home = getenv("HOME");
char *term = getenv("TERM");
/* Vars for optargs */
int opt;
static struct option options[] = {
@@ -1149,15 +1147,11 @@ int main(int argc, char *argv[])
int argv_quiet = 0;
int loops = 2, reconnect = 0, timeout = 0;
if (term && (!strncasecmp("screen", term, 6) ||
!strncasecmp("vt100", term, 5))) {
feature_level = 1;
} else {
feature_level = 0;
}
#ifdef WIN32
feature_level = 0;
#else
feature_level = 1;
#endif
strncpy(internal_profile.host, "127.0.0.1", sizeof(internal_profile.host));
@@ -1347,7 +1341,12 @@ int main(int argc, char *argv[])
}
global_handle = &handle;
global_profile = profile;
esl_thread_create_detached(msg_thread_run, &handle);
if (esl_thread_create_detached(msg_thread_run, &handle) != ESL_SUCCESS) {
printf("Error starting thread!\n");
esl_disconnect(&handle);
return 0;
}
#ifdef HAVE_EDITLINE
el = el_init(__FILE__, stdin, stdout, stderr);