From c7b83c88d8d695841a34b6b4d5570662deccc5c9 Mon Sep 17 00:00:00 2001
From: Brian Cox <BrianRCox@gmail.com>
Date: Thu, 9 Jun 2016 23:33:22 -0700
Subject: [PATCH] Add version strings for 'what' command (or 'version' on AROS)

---
 src/siggen/siggenstrings.cpp     |  9 ++++++++-
 src/siggen/siggenstrings.h       |  3 ++-
 src/tripwire/tripwirestrings.cpp | 10 +++++++++-
 src/tripwire/tripwirestrings.h   |  1 +
 src/twadmin/twadminstrings.cpp   |  7 +++++++
 src/twadmin/twadminstrings.h     |  1 +
 src/twprint/twprintstrings.cpp   |  9 ++++++++-
 src/twprint/twprintstrings.h     |  3 ++-
 8 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/siggen/siggenstrings.cpp b/src/siggen/siggenstrings.cpp
index 621ad4a..d627a24 100644
--- a/src/siggen/siggenstrings.cpp
+++ b/src/siggen/siggenstrings.cpp
@@ -42,6 +42,12 @@
 #include "stdsiggen.h"
 #include "siggenstrings.h"
 
+#ifdef __AROS__
+# define VERSION_PREFIX "$VER: "
+#else
+# define VERSION_PREFIX "@(#)"
+#endif
+
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // String Table
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -62,10 +68,11 @@ TSS_BeginStringtable( cSiggen )
                 _T("\n")
               ),
     TSS_StringEntry( siggen::STR_SIGGEN_VERSION,        _T("siggen: Display signature function values. \n")),
+    TSS_StringEntry( siggen::STR_EMBEDDED_VERSION,      _T(VERSION_PREFIX "siggen " PACKAGE_VERSION)),
     TSS_StringEntry( siggen::STR_ERR_OPEN_FAILED,       _T("File could not be opened") ),
     TSS_StringEntry( siggen::STR_ERR_NO_FILE,           _T("File does not exist") ),
     TSS_StringEntry( siggen::STR_SIGGEN_NOT_REG_FILE,   _T(" is not a regular file; ignoring.") )
-    
+
 TSS_EndStringtable( cSiggen )
 
 // eof: siggenstrings.cpp
diff --git a/src/siggen/siggenstrings.h b/src/siggen/siggenstrings.h
index cac8b73..e026f10 100644
--- a/src/siggen/siggenstrings.h
+++ b/src/siggen/siggenstrings.h
@@ -45,7 +45,8 @@
 TSS_BeginStringIds( siggen )
 
     STR_SIGGEN_USAGE,
-    STR_SIGGEN_VERSION,    
+    STR_SIGGEN_VERSION,
+    STR_EMBEDDED_VERSION,
     STR_SIGGEN_NOT_REG_FILE,
     STR_ERR_NO_FILE,
     STR_ERR_OPEN_FAILED
diff --git a/src/tripwire/tripwirestrings.cpp b/src/tripwire/tripwirestrings.cpp
index bb86ae4..2e88fb0 100644
--- a/src/tripwire/tripwirestrings.cpp
+++ b/src/tripwire/tripwirestrings.cpp
@@ -47,10 +47,18 @@
 #define MAPI_OPTION
 #endif
 
+#ifdef __AROS__
+# define VERSION_PREFIX "$VER: "
+#else
+# define VERSION_PREFIX "@(#)"
+#endif
+
+
 TSS_BeginStringtable( cTripwire )
 
     TSS_StringEntry( tripwire::STR_TRIPWIRE_VERSION,            _T("tripwire: File integrity assessment application.\n")),
-    
+    TSS_StringEntry( tripwire::STR_EMBEDDED_VERSION,            _T(VERSION_PREFIX "tripwire " PACKAGE_VERSION)),
+
     TSS_StringEntry( tripwire::STR_TRIPWIRE_USAGE_SUMMARY,
                 _T("Usage:\n")
                 _T("\n")
diff --git a/src/tripwire/tripwirestrings.h b/src/tripwire/tripwirestrings.h
index 587df82..d2d1196 100644
--- a/src/tripwire/tripwirestrings.h
+++ b/src/tripwire/tripwirestrings.h
@@ -40,6 +40,7 @@
 TSS_BeginStringIds( tripwire )
 
     STR_TRIPWIRE_VERSION,
+    STR_EMBEDDED_VERSION,
     STR_TRIPWIRE_HELP_INIT,
     STR_TRIPWIRE_HELP_CHECK,
     STR_TRIPWIRE_HELP_UPDATE,
diff --git a/src/twadmin/twadminstrings.cpp b/src/twadmin/twadminstrings.cpp
index a3ecc86..c23a688 100644
--- a/src/twadmin/twadminstrings.cpp
+++ b/src/twadmin/twadminstrings.cpp
@@ -39,9 +39,16 @@
 #include "twadmin.h"
 #include "twadminstrings.h"
 
+#ifdef __AROS__
+# define VERSION_PREFIX "$VER: "
+#else
+# define VERSION_PREFIX "@(#)"
+#endif
+
 TSS_BeginStringtable( cTWAdmin )
     
     TSS_StringEntry( twadmin::STR_TWADMIN_VERSION,              _T("twadmin: Tripwire administrative tool.\n") ),
+    TSS_StringEntry( twadmin::STR_EMBEDDED_VERSION,            _T(VERSION_PREFIX "twadmin " PACKAGE_VERSION)),
 
     TSS_StringEntry( twadmin::STR_TWADMIN_USAGE_SUMMARY,            
                 _T("Usage:\n")
diff --git a/src/twadmin/twadminstrings.h b/src/twadmin/twadminstrings.h
index 7262fa7..63116fa 100644
--- a/src/twadmin/twadminstrings.h
+++ b/src/twadmin/twadminstrings.h
@@ -45,6 +45,7 @@
 TSS_BeginStringIds( twadmin )
 
     STR_TWADMIN_VERSION,
+    STR_EMBEDDED_VERSION,
     STR_TWADMIN_USAGE_SUMMARY,
     STR_TWADMIN_HELP_CREATE_CFGFILE,
     STR_TWADMIN_HELP_PRINT_CFGFILE,
diff --git a/src/twprint/twprintstrings.cpp b/src/twprint/twprintstrings.cpp
index 42eac57..a49caac 100644
--- a/src/twprint/twprintstrings.cpp
+++ b/src/twprint/twprintstrings.cpp
@@ -39,6 +39,12 @@
 #include "twprint.h"
 #include "twprintstrings.h"
 
+#ifdef __AROS__
+# define VERSION_PREFIX "$VER: "
+#else
+# define VERSION_PREFIX "@(#)"
+#endif
+
 TSS_BeginStringtable( cTWPrint )
     
     TSS_StringEntry( twprint::STR_TWPRINT_USAGE_SUMMARY,           
@@ -82,7 +88,8 @@ TSS_BeginStringtable( cTWPrint )
                 _T("\n")
               ),
     
-    TSS_StringEntry( twprint::STR_TWPRINT_VERSION, _T("twprint: Tripwire database and report printer.\n") ),
+    TSS_StringEntry( twprint::STR_TWPRINT_VERSION,   _T("twprint: Tripwire database and report printer.\n") ),
+    TSS_StringEntry( twprint::STR_EMBEDDED_VERSION,  _T(VERSION_PREFIX "twprint " PACKAGE_VERSION)),
 
 TSS_EndStringtable( cTWPrint )
 
diff --git a/src/twprint/twprintstrings.h b/src/twprint/twprintstrings.h
index 2acac1f..f233b02 100644
--- a/src/twprint/twprintstrings.h
+++ b/src/twprint/twprintstrings.h
@@ -47,7 +47,8 @@ TSS_BeginStringIds( twprint )
     STR_TWPRINT_USAGE_SUMMARY,
     STR_TWPRINT_HELP_PRINT_REPORT,
     STR_TWPRINT_HELP_PRINT_DATABASE,
-    STR_TWPRINT_VERSION
+    STR_TWPRINT_VERSION,
+    STR_EMBEDDED_VERSION
 
 TSS_EndStringIds( twprint )