]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
curl: include libmetalink version in --version output
authorDaniel Stenberg <daniel@haxx.se>
Fri, 21 May 2021 13:39:30 +0000 (15:39 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Sat, 22 May 2021 09:29:41 +0000 (11:29 +0200)
Closes #7112

src/tool_help.c

index 78c441e776d4ada6c92e01440409fb2ee8c1376d..45f137f2ad52a2d4dd7c8142347884393cb85fe8 100644 (file)
 #if defined(HAVE_STRCASECMP) && defined(HAVE_STRINGS_H)
 #include <strings.h>
 #endif
+#define ENABLE_CURLX_PRINTF
+/* use our own printf() functions */
+#include "curlx.h"
 
 #include "tool_panykey.h"
 #include "tool_help.h"
 #include "tool_libinfo.h"
+#include "tool_metalink.h"
 #include "tool_version.h"
 
 #include "memdebug.h" /* keep this as LAST include */
@@ -963,11 +967,27 @@ featcomp(const void *p1, const void *p2)
 #endif
 }
 
+#ifdef USE_METALINK
+static const char *metalnk_version(void)
+{
+  static char version[25];
+  int major = 0;
+  int minor = 0;
+  int patch = 0;
+  metalink_get_version(&major, &minor, &patch);
+  msnprintf(version, sizeof(version), " libmetalink/%u.%u.%u",
+            major, minor, patch);
+  return version;
+}
+#else
+#define metalnk_version() ""
+#endif
+
 void tool_version_info(void)
 {
   const char *const *proto;
 
-  printf(CURL_ID "%s\n", curl_version());
+  printf(CURL_ID "%s%s\n", curl_version(), metalnk_version());
 #ifdef CURL_PATCHSTAMP
   printf("Release-Date: %s, security patched: %s\n",
          LIBCURL_TIMESTAMP, CURL_PATCHSTAMP);