Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove the version from STDERR messages and add -v | --version flag

Browse source
This commit is contained in:
Tony Corbett G0WFV 2016-05-14 23:26:16 +01:00
parent d772c76b6e
commit 4d44936e14
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
MMDVMHost.cpp
View file

@ -72,8 +72,17 @@ const char* HEADER4 = "Copyright(C) 2015, 2016 by Jonathan Naylor, G4KLX and oth
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
const char* iniFile = DEFAULT_INI_FILE; const char* iniFile = DEFAULT_INI_FILE;
if (argc > 1) if (argc > 1) {
iniFile = argv[1]; for (int currentArg = 1; currentArg < argc; ++currentArg) {
std::string arg = argv[currentArg];
if ((arg == "-v") || (arg == "--version")) {
::fprintf(stdout, "MMDVMHost %s\n", VERSION);
return 0;
} else {
iniFile = argv[currentArg];
}
}
}
#if !defined(_WIN32) && !defined(_WIN64) #if !defined(_WIN32) && !defined(_WIN64)
::signal(SIGTERM, sigHandler); ::signal(SIGTERM, sigHandler);
@ -128,13 +137,13 @@ int CMMDVMHost::run()
{ {
bool ret = m_conf.read(); bool ret = m_conf.read();
if (!ret) { if (!ret) {
::fprintf(stderr, "MMDVMHost-%s: cannot read the .ini file\n", VERSION); ::fprintf(stderr, "MMDVMHost: cannot read the .ini file\n");
return 1; return 1;
} }
ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel()); ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
if (!ret) { if (!ret) {
::fprintf(stderr, "MMDVMHost-%s: unable to open the log file\n", VERSION); ::fprintf(stderr, "MMDVMHost: unable to open the log file\n");
return 1; return 1;
} }