[Pkg-gnupg-commit] [libassuan] 12/19: Add special check version request \001\001

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 4f5596cf09c9e3e7845aa703f68e49168797fd2a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 15 18:44:09 2017 +0100

    Add special check version request \001\001
    
    * src/assuan.c (assuan_check_version): Handle version "\001\001"
    * tests/version.c (main): Print extended version info.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/assuan.c    | 2 ++
 src/sysutils.c  | 2 +-
 tests/version.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/assuan.c b/src/assuan.c
index e59df65..b6dec93 100644
--- a/src/assuan.c
+++ b/src/assuan.c
@@ -281,5 +281,7 @@ compare_versions (const char *my_version, const char *req_version)
 const char *
 assuan_check_version (const char *req_version)
 {
+  if (req_version && req_version[0] == 1 && req_version[1] == 1)
+    return _assuan_sysutils_blurb ();
   return compare_versions (PACKAGE_VERSION, req_version);
 }
diff --git a/src/sysutils.c b/src/sysutils.c
index 74031cd..afa7aa1 100644
--- a/src/sysutils.c
+++ b/src/sysutils.c
@@ -48,8 +48,8 @@ _assuan_sysutils_blurb (void)
     "This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n"
     "Copyright 2001-2013 Free Software Foundation, Inc.\n"
     "Copyright 2001-2014 g10 Code GmbH\n"
-    "SPDX-License-Identifier: LGPL-2.1+\n"
     "\n"
+    "SPDX-License-Identifier: LGPL-2.1+\n"
     "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
     "\n\n";
   return blurb;
diff --git a/tests/version.c b/tests/version.c
index 96e43c0..4ff700e 100644
--- a/tests/version.c
+++ b/tests/version.c
@@ -84,6 +84,7 @@ main (int argc, char **argv)
       log_info ("Version from header: %s (0x%06x)\n",
                 ASSUAN_VERSION, ASSUAN_VERSION_NUMBER);
       log_info ("Version from binary: %s \n", assuan_check_version (NULL));
+      log_info ("Copyright blurb ...:%s\n", assuan_check_version ("\001\001"));
     }
 
   return errorcount ? 1 : 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git