external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

refine config option

Browse source
This commit is contained in:
winlin 2014-04-13 13:57:39 +08:00
parent aa784377fd
commit f980340e89
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/app/srs_app_config.cpp
View file

@ -1064,6 +1064,7 @@ int SrsConfig::parse_options(int argc, char** argv)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
show_help = true;
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if ((ret = parse_argv(i, argv)) != ERROR_SUCCESS) { if ((ret = parse_argv(i, argv)) != ERROR_SUCCESS) {
return ret; return ret;
@ -1139,13 +1140,11 @@ int SrsConfig::parse_file(const char* filename)
int SrsConfig::parse_argv(int& i, char** argv) int SrsConfig::parse_argv(int& i, char** argv)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
char* p = argv[i]; char* p = argv[i];
if (*p++ != '-') { if (*p++ != '-') {
ret = ERROR_SYSTEM_CONFIG_INVALID; show_help = true;
srs_error("invalid options(index=%d, value=%s), "
"must starts with -, see help: %s -h, ret=%d", i, argv[i], argv[0], ret);
return ret; return ret;
} }
@ -1157,9 +1156,11 @@ int SrsConfig::parse_argv(int& i, char** argv)
break; break;
case 'v': case 'v':
case 'V': case 'V':
show_help = false;
show_version = true; show_version = true;
break; break;
case 'c': case 'c':
show_help = false;
if (*p) { if (*p) {
config_file = p; config_file = p;
return ret; return ret;
@ -1187,12 +1188,13 @@ void SrsConfig::print_help(char** argv)
RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n" RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n"
"Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n" "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n"
"Build: "SRS_BUILD_DATE" Configuration:"SRS_CONFIGURE"\n" "Build: "SRS_BUILD_DATE" Configuration:"SRS_CONFIGURE"\n"
"Usage: %s [-h?vV] [-c <filename>]\n" "Usage: %s [-h?vVt] [-c <filename>]\n"
"\n" "\n"
"Options:\n" "Options:\n"
" -?-h : show help\n" " -?, -h : show help\n"
" -v-V : show version and exit\n" " -v, -V : show version and exit\n"
" -c filename : set configuration file\n" " -t : test configuration file\n"
" -c filename : set configuration file\n"
"\n" "\n"
RTMP_SIG_SRS_WEB"\n" RTMP_SIG_SRS_WEB"\n"
RTMP_SIG_SRS_URL"\n" RTMP_SIG_SRS_URL"\n"