From 488b183811fc25c1ae49b4730491accf1adf518e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Nov 2016 16:24:58 +0100 Subject: common: Improve compare_string_versions. * common/stringhelp.c: Include limits.h. (compare_version_strings): Change semantics to behave like strcmp. Include the patch lebel in the comparison. Allow checking a single version string. * common/t-stringhelp.c (test_compare_version_strings): Adjust test vectors and a few new vectors. * g10/call-agent.c (warn_version_mismatch): Adjust to new sematics. * g10/call-dirmngr.c (warn_version_mismatch): Ditto. * sm/call-agent.c (warn_version_mismatch): Ditto. * sm/call-dirmngr.c (warn_version_mismatch): Ditto. Signed-off-by: Werner Koch --- g10/call-agent.c | 2 +- g10/call-dirmngr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'g10') diff --git a/g10/call-agent.c b/g10/call-agent.c index b17a80f11..eeea7bf97 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -195,7 +195,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode) if (err) log_error (_("error getting version from '%s': %s\n"), servername, gpg_strerror (err)); - else if (!compare_version_strings (serverversion, myversion)) + else if (compare_version_strings (serverversion, myversion) < 0) { char *warn; diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index f7398333c..66db357db 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -145,7 +145,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername) if (err) log_error (_("error getting version from '%s': %s\n"), servername, gpg_strerror (err)); - else if (!compare_version_strings (serverversion, myversion)) + else if (compare_version_strings (serverversion, myversion) < 0) { char *warn; -- cgit v1.2.3