From: Moises Silva <moy@sangoma.com>
Date: Sat, 17 Dec 2011 22:25:36 +0000 (-0500)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eef66d6c17cf6972b7e60b45fc1762844c31782;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in
	libs/esl/fs_cli.c
---

3eef66d6c17cf6972b7e60b45fc1762844c31782
diff --cc libs/esl/fs_cli.c
index 0f432f464f,108b42cf6e..53d1bdfce4
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@@ -1103,15 -1115,16 +1105,16 @@@ int main(int argc, char *argv[]
  	char cmd_str[1024] = "";
  	cli_profile_t *profile = NULL;
  #ifndef WIN32
 -	char hfile[512] = "/tmp/fs_cli_history";
 -	char cfile[512] = "/etc/fs_cli.conf";
 -	char dft_cfile[512] = "/etc/fs_cli.conf";
 +	char hfile[512] = "/etc/nbess7_cli_history";
 +	char cfile[512] = "/etc/nbess7_cli.conf";
 +	char dft_cfile[512] = "/etc/nbess7_cli.conf";
  #else
 -	char hfile[512] = "fs_cli_history";
 -	char cfile[512] = "fs_cli.conf";
 -	char dft_cfile[512] = "fs_cli.conf";
 +	char hfile[512] = "nbess7_cli_history";
 +	char cfile[512] = "nbess7_cli.conf";
 +	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[] = {
@@@ -1270,20 -1294,20 +1284,20 @@@
  	esl_set_string(input_text_color, profile->input_text_color);
  	esl_set_string(output_text_color, profile->output_text_color);
  	if (argv_host) {
 -		if (argv_port && profile->port != 8021) {
 -			snprintf(bare_prompt_str, sizeof(bare_prompt_str), "freeswitch@%s:%u@%s> ", profile->host, profile->port, profile->name);
 +		if (argv_port && profile->port != 8821) {
 +			snprintf(prompt_str, sizeof(prompt_str), PROMPT_PREFIX "@%s:%u@%s> ", profile->host, profile->port, profile->name);
  		} else {
 -			snprintf(bare_prompt_str, sizeof(bare_prompt_str), "freeswitch@%s@%s> ", profile->host, profile->name);
 +			snprintf(prompt_str, sizeof(prompt_str), PROMPT_PREFIX "@%s@%s> ", profile->host, profile->name);
  		}
  	} else {
 -		snprintf(bare_prompt_str, sizeof(bare_prompt_str), "freeswitch@%s> ", profile->name);
 +		snprintf(prompt_str, sizeof(prompt_str), PROMPT_PREFIX "@%s> ", profile->name);
  	}
  	bare_prompt_str_len = (int)strlen(bare_prompt_str);
- #ifdef WIN32
- 	snprintf(prompt_str, sizeof(prompt_str), "%s", bare_prompt_str); /* Not supporting this for now */
- #else
- 	snprintf(prompt_str, sizeof(prompt_str), "%s%s%s", prompt_color, bare_prompt_str, input_text_color);
- #endif
+ 	if (feature_level) {
+ 		snprintf(prompt_str, sizeof(prompt_str), "%s%s%s", prompt_color, bare_prompt_str, input_text_color);
+ 	} else {
+ 		snprintf(prompt_str, sizeof(prompt_str), "%s", bare_prompt_str);
+ 	}
   connect:
  	connected = 0;
  	while (--loops > 0) {