From 71f2a18cd3bc2fad9ef7f31b966c9a50a6ba5212 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 14 Sep 2020 16:39:38 +0100 Subject: [PATCH] #6342 updated copyright in cmd version to use build date --- ChangeLog | 1 + src/lib/common/Version.cpp | 3 ++- src/lib/common/Version.h | 1 + src/lib/synergy/App.cpp | 14 ++++++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca2446fd5..c0c2e2529 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Bug fixes: - #6755 Fixed Vulnerability in vreadf function detected by Static analysis - #6758 Account name with space on windows causes synergy to error when starting - #6760 Synergy loses license when creating a System scope config +- #6342 Updated copyright year in version to use build date Enhancements: - #6750 Integrate SonarCloud for static analysis and test coverage diff --git a/src/lib/common/Version.cpp b/src/lib/common/Version.cpp index 442c05b87..ca6e66851 100644 --- a/src/lib/common/Version.cpp +++ b/src/lib/common/Version.cpp @@ -18,8 +18,9 @@ #include "common/Version.h" +const char* kBuildYear = __DATE__ + 7; const char* kApplication = "Synergy"; -const char* kCopyright = "Copyright (C) 2012-2019 Symless Ltd.\n" +const char* kCopyright = "Copyright (C) 2012-%s Symless Ltd.\n" "Copyright (C) 2008-2014 Nick Bolton\n" "Copyright (C) 2002-2014 Chris Schoeneman"; const char* kContact = "Email: engineering@symless.com"; diff --git a/src/lib/common/Version.h b/src/lib/common/Version.h index 9ba0a66e8..6a7bc7293 100644 --- a/src/lib/common/Version.h +++ b/src/lib/common/Version.h @@ -30,6 +30,7 @@ extern const char* kApplication; extern const char* kCopyright; extern const char* kContact; extern const char* kWebsite; +extern const char* kBuildYear; // build version. follows linux kernel style: an even minor number implies // a release version, odd implies development version. diff --git a/src/lib/synergy/App.cpp b/src/lib/synergy/App.cpp index 23d4fcf7d..c2c7c5a65 100644 --- a/src/lib/synergy/App.cpp +++ b/src/lib/synergy/App.cpp @@ -83,7 +83,17 @@ App::~App() void App::version() { - static const int buffer_size = 500; + static const size_t buffer_size = 500; + static const size_t cpight_size = 200; + + char copyrightBuffer[cpight_size]; + snprintf( + copyrightBuffer, + cpight_size, + kCopyright, + kBuildYear + ); + char buffer[buffer_size]; snprintf( buffer, @@ -93,7 +103,7 @@ App::version() kVersion, kProtocolMajorVersion, kProtocolMinorVersion, - kCopyright + copyrightBuffer ); std::cout << buffer << std::endl;