winlin

refine config option

@@ -1064,6 +1064,7 @@ int SrsConfig::parse_options(int argc, char** argv) @@ -1064,6 +1064,7 @@ int SrsConfig::parse_options(int argc, char** argv)
1064 { 1064 {
1065 int ret = ERROR_SUCCESS; 1065 int ret = ERROR_SUCCESS;
1066 1066
  1067 + show_help = true;
1067 for (int i = 1; i < argc; i++) { 1068 for (int i = 1; i < argc; i++) {
1068 if ((ret = parse_argv(i, argv)) != ERROR_SUCCESS) { 1069 if ((ret = parse_argv(i, argv)) != ERROR_SUCCESS) {
1069 return ret; 1070 return ret;
@@ -1139,13 +1140,11 @@ int SrsConfig::parse_file(const char* filename) @@ -1139,13 +1140,11 @@ int SrsConfig::parse_file(const char* filename)
1139 int SrsConfig::parse_argv(int& i, char** argv) 1140 int SrsConfig::parse_argv(int& i, char** argv)
1140 { 1141 {
1141 int ret = ERROR_SUCCESS; 1142 int ret = ERROR_SUCCESS;
1142 - 1143 +
1143 char* p = argv[i]; 1144 char* p = argv[i];
1144 1145
1145 if (*p++ != '-') { 1146 if (*p++ != '-') {
1146 - ret = ERROR_SYSTEM_CONFIG_INVALID;  
1147 - srs_error("invalid options(index=%d, value=%s), "  
1148 - "must starts with -, see help: %s -h, ret=%d", i, argv[i], argv[0], ret); 1147 + show_help = true;
1149 return ret; 1148 return ret;
1150 } 1149 }
1151 1150
@@ -1157,9 +1156,11 @@ int SrsConfig::parse_argv(int& i, char** argv) @@ -1157,9 +1156,11 @@ int SrsConfig::parse_argv(int& i, char** argv)
1157 break; 1156 break;
1158 case 'v': 1157 case 'v':
1159 case 'V': 1158 case 'V':
  1159 + show_help = false;
1160 show_version = true; 1160 show_version = true;
1161 break; 1161 break;
1162 case 'c': 1162 case 'c':
  1163 + show_help = false;
1163 if (*p) { 1164 if (*p) {
1164 config_file = p; 1165 config_file = p;
1165 return ret; 1166 return ret;
@@ -1187,12 +1188,13 @@ void SrsConfig::print_help(char** argv) @@ -1187,12 +1188,13 @@ void SrsConfig::print_help(char** argv)
1187 RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n" 1188 RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n"
1188 "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n" 1189 "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n"
1189 "Build: "SRS_BUILD_DATE" Configuration:"SRS_CONFIGURE"\n" 1190 "Build: "SRS_BUILD_DATE" Configuration:"SRS_CONFIGURE"\n"
1190 - "Usage: %s [-h?vV] [-c <filename>]\n" 1191 + "Usage: %s [-h?vVt] [-c <filename>]\n"
1191 "\n" 1192 "\n"
1192 "Options:\n" 1193 "Options:\n"
1193 - " -?-h : show help\n"  
1194 - " -v-V : show version and exit\n"  
1195 - " -c filename : set configuration file\n" 1194 + " -?, -h : show help\n"
  1195 + " -v, -V : show version and exit\n"
  1196 + " -t : test configuration file\n"
  1197 + " -c filename : set configuration file\n"
1196 "\n" 1198 "\n"
1197 RTMP_SIG_SRS_WEB"\n" 1199 RTMP_SIG_SRS_WEB"\n"
1198 RTMP_SIG_SRS_URL"\n" 1200 RTMP_SIG_SRS_URL"\n"