Merge pull request #279 from m1geo/master

Added Git ID Version to the --version switch
g4klx · Mar 13, 2017 · 8073ff9 · 8073ff9
2 parents 84f4418 + 9d71de3
commit 8073ff9
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
@@ -78,21 +78,21 @@ const char* HEADER4 = "Copyright(C) 2015-2017 by Jonathan Naylor, G4KLX and othe
 
 int main(int argc, char** argv)
 {
-	const char* iniFile = DEFAULT_INI_FILE;
-	if (argc > 1) {
-		for (int currentArg = 1; currentArg < argc; ++currentArg) {
-			std::string arg = argv[currentArg];
-			if ((arg == "-v") || (arg == "--version")) {
-				::fprintf(stdout, "MMDVMHost version %s\n", VERSION);
-				return 0;
-			} else if (arg.substr(0,1) == "-") {
-				::fprintf(stderr, "Usage: MMDVMHost [-v|--version] [filename]\n");
-				return 1;
-			} else {
-				iniFile = argv[currentArg];
-			}
-		}
-	}
+        const char* iniFile = DEFAULT_INI_FILE;
+        if (argc > 1) {
+                for (int currentArg = 1; currentArg < argc; ++currentArg) {
+                        std::string arg = argv[currentArg];
+                        if ((arg == "-v") || (arg == "--version")) {
+                                ::fprintf(stdout, "MMDVMHost version %s git #%.7s\n", VERSION, gitversion);
+                                return 0;
+                        } else if (arg.substr(0,1) == "-") {
+                                ::fprintf(stderr, "Usage: MMDVMHost [-v|--version] [filename]\n");
+                                return 1;
+                        } else {
+                                iniFile = argv[currentArg];
+                        }
+                }
+        }
 
 #if !defined(_WIN32) && !defined(_WIN64)
   ::signal(SIGTERM, sigHandler);