updated for version 7.3.096
Problem: "gvim -nb" is not interruptable. Leaking file descriptor on
netbeans connection error.
Solution: Check for CTRL-C typed. Free file descriptor. (Xavier de Gaye)
diff --git a/src/netbeans.c b/src/netbeans.c
index 71b664c..01cb5fb 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -321,6 +321,7 @@
{
nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
PERROR("gethostbyname() in netbeans_connect()");
+ sock_close(sd);
goto theend;
}
memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
@@ -370,15 +371,12 @@
|| (errno == EINTR)))
{
nbdebug(("retrying...\n"));
- sleep(5);
- if (!doabort)
+ mch_delay(3000L, TRUE);
+ ui_breakcheck();
+ if (got_int)
{
- ui_breakcheck();
- if (got_int)
- {
- errno = EINTR;
- break;
- }
+ errno = EINTR;
+ break;
}
if (connect(sd, (struct sockaddr *)&server,
sizeof(server)) == 0)
@@ -393,6 +391,7 @@
/* Get here when the server can't be found. */
nbdebug(("Cannot connect to Netbeans #2\n"));
PERROR(_("Cannot connect to Netbeans #2"));
+ sock_close(sd);
if (doabort)
getout(1);
goto theend;
@@ -403,6 +402,7 @@
{
nbdebug(("Cannot connect to Netbeans\n"));
PERROR(_("Cannot connect to Netbeans"));
+ sock_close(sd);
if (doabort)
getout(1);
goto theend;
diff --git a/src/version.c b/src/version.c
index 2873adb..3e56bdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 96,
+/**/
95,
/**/
94,