Add print version to tools

Version.cpp

@@ -61,9 +61,9 @@ const char* getBranch() {
 	return TO_STRING(GIT_BRANCH);
 }
 
-void printVersion() {
-	fprintf(stdout,"Gigablast Version      : %s\n", getVersion());
-	fprintf(stdout,"Gigablast Build config : %s\n", getBuildConfig());
-	fprintf(stdout,"Gigablast Git branch   : %s\n", getBranch());
-	fprintf(stdout,"Gigablast Git commit   : %s\n", getCommitId());
+void printVersion(const char *name) {
+	fprintf(stdout,"%s Version      : %s\n", name, getVersion());
+	fprintf(stdout,"%s Build config : %s\n", name, getBuildConfig());
+	fprintf(stdout,"%s Git branch   : %s\n", name, getBranch());
+	fprintf(stdout,"%s Git commit   : %s\n", name, getCommitId());
 }

Version.h

@@ -6,6 +6,6 @@ char *getVersion ( ) ;
 const char* getBuildConfig();
 const char* getCommitId();
 
-void printVersion();
+void printVersion(const char *name = "Gigablast");
 
 #endif // GB_VERSION_H

tools/clean_url.cpp

@@ -2,6 +2,7 @@
 #include "Log.h"
 #include "Conf.h"
 #include "Mem.h"
+#include "Version.h"
 #include <sys/stat.h>
 #include <errno.h>
 #include <string>
@@ -25,6 +26,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	// initialize library
 	g_mem.init();
 	hashinit();

tools/decode_rdbkey.cpp

@@ -6,6 +6,7 @@
 #include "Mem.h"
 #include "GbUtil.h"
 #include "types.h"
+#include "Version.h"
 #include <libgen.h>
 
 static void print_usage(const char *argv0) {
@@ -26,6 +27,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	// initialize library
 	g_mem.init();
 	hashinit();

tools/dump_badlinks.cpp

@@ -10,6 +10,7 @@
 #include "UrlBlockCheck.h"
 #include "UrlMatchList.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -49,6 +50,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_charset.cpp

@@ -12,6 +12,7 @@
 #include "WantedChecker.h"
 #include "Domains.h"
 #include "ip.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -53,6 +54,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_rdbbuckets.cpp

@@ -4,6 +4,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "GbUtil.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -34,6 +35,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	char filepath[PATH_MAX];
 
 	char dir[PATH_MAX];

tools/dump_rdbindex.cpp

@@ -4,6 +4,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "GbUtil.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -25,6 +26,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	char filepath[PATH_MAX];
 
 	char dir[PATH_MAX];

tools/dump_rdbtree.cpp

@@ -5,6 +5,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "GbUtil.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -37,6 +38,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	char filepath[PATH_MAX];
 
 

tools/dump_rebuild_noindex.cpp

@@ -11,6 +11,7 @@
 #include "UrlMatchList.h"
 #include "WantedChecker.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -52,6 +53,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_redirect.cpp

@@ -12,6 +12,7 @@
 #include "WantedChecker.h"
 #include "Domains.h"
 #include "ip.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -53,6 +54,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_unwanted.cpp

@@ -12,6 +12,7 @@
 #include "WantedChecker.h"
 #include "utf8_convert.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -53,6 +54,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+	if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+		printVersion(basename(argv[0]));
+		return 1;
+	}
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_wordcount.cpp

@@ -8,6 +8,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -47,6 +48,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/dump_wrong_encoding.cpp

@@ -13,6 +13,7 @@
 #include "ip.h"
 #include "utf8_convert.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <algorithm>
 #include <limits.h>
@@ -59,6 +60,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/generate_rdbindex.cpp

@@ -5,6 +5,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "GbUtil.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -26,6 +27,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	char filepath[PATH_MAX];
 
 	char dir[PATH_MAX];

tools/get_titlerec.cpp

@@ -8,6 +8,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -46,6 +47,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/print_urlinfo.cpp

@@ -5,6 +5,7 @@
 #include "Log.h"
 #include "Conf.h"
 #include "Mem.h"
+#include "Version.h"
 #include <libgen.h>
 
 static void print_usage(const char *argv0) {
@@ -25,6 +26,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	// initialize library
 	g_mem.init();
 	hashinit();

tools/validate_rdbindex.cpp

@@ -6,6 +6,7 @@
 #include "RdbIndexQuery.h"
 #include "Collectiondb.h"
 #include "Mem.h"
+#include "Version.h"
 #include <libgen.h>
 #include <stdlib.h>
 #include <algorithm>
@@ -118,6 +119,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	char tmpPath[PATH_MAX];
 
 	// collection name

tools/verify_spiderdb.cpp

@@ -7,6 +7,7 @@
 #include "Log.h"
 #include "Conf.h"
 #include "Mem.h"
+#include "Version.h"
 #include "third-party/sparsepp/sparsepp/spp.h"
 #include <libgen.h>
 #include <arpa/inet.h>
@@ -49,6 +50,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library

tools/verify_titledb.cpp

@@ -8,6 +8,7 @@
 #include "Conf.h"
 #include "Mem.h"
 #include "Domains.h"
+#include "Version.h"
 #include <libgen.h>
 #include <limits.h>
 
@@ -46,6 +47,11 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
+    if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0 ) {
+        printVersion(basename(argv[0]));
+        return 1;
+    }
+
 	g_log.m_disabled = true;
 
 	// initialize library