From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 3 May 2020 15:03:29 +0000 (+0200)
Subject: patch 8.2.0689: when using getaddrinfo() the error message is unclear
X-Git-Tag: v8.2.0689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a38b2b737e244eb2e4f199e070b05f86f4d433d4;p=vim

patch 8.2.0689: when using getaddrinfo() the error message is unclear

Problem:    When using getaddrinfo() the error message is unclear.
Solution:   Use gai_strerror() to get the message. (Ozaki Kiichi,
            closes #6034)
---

diff --git a/src/channel.c b/src/channel.c
index 9577f3dc4..68ac4bc29 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -955,6 +955,7 @@ channel_open(
     int			sd = -1;
     channel_T		*channel = NULL;
 #ifdef FEAT_IPV6
+    int			err;
     struct addrinfo	hints;
     struct addrinfo	*res = NULL;
     struct addrinfo	*addr = NULL;
@@ -986,10 +987,11 @@ channel_open(
     // Set port number manually in order to prevent name resolution services
     // from being invoked in the environment where AI_NUMERICSERV is not
     // defined.
-    if (getaddrinfo(hostname, NULL, &hints, &res) != 0)
+    if ((err = getaddrinfo(hostname, NULL, &hints, &res)) != 0)
     {
 	ch_error(channel, "in getaddrinfo() in channel_open()");
-	PERROR(_("E901: getaddrinfo() in channel_open()"));
+	semsg(_("E901: getaddrinfo() in channel_open(): %s"),
+							   gai_strerror(err));
 	channel_free(channel);
 	return NULL;
     }
diff --git a/src/version.c b/src/version.c
index fcc897a0f..c08337200 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    689,
 /**/
     688,
 /**/