kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix command line args when config file present 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10963 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-12-26 21:10:40 +00:00
parent 5267761ff9
commit 7e02aeca1f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/esl/fs_cli.c
View File

@ -365,16 +365,6 @@ int main(int argc, char *argv[])
}
esl_config_close_file(&cfg);
}
if (argv_host) {
esl_set_string(profiles[cur].host, temp_host);
}
if (argv_port) {
profiles[cur].port = (esl_port_t)temp_port;
}
if (argv_pass) {
esl_set_string(profiles[cur].pass, temp_pass);
}
if (optind < argc) {
if (get_profile(argv[optind], &profile)) {
@ -388,10 +378,20 @@ int main(int argc, char *argv[])
}
}
if (argv_host) {
esl_set_string(profile->host, temp_host);
}
if (argv_port) {
profile->port = (esl_port_t)temp_port;
}
if (argv_pass) {
esl_set_string(profile->pass, temp_pass);
}
esl_log(ESL_LOG_INFO, "Using profile %s [%s]\n", profile->name, profile->host);
if (argv_host) {
snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->host);
snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s@%s> ", profile->host, profile->name);
} else {
snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->name);
}