aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.096

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2011-01-04 18:11:43 +01:00
parent d91f704b03
commit 870b05c4c0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/netbeans.c
View File

@@ -321,6 +321,7 @@ netbeans_connect(char *params, int doabort)
{
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,16 +371,13 @@ netbeans_connect(char *params, int doabort)
|| (errno == EINTR)))
{
nbdebug(("retrying...\n"));
sleep(5);
if (!doabort)
{
mch_delay(3000L, TRUE);
ui_breakcheck();
if (got_int)
{
errno = EINTR;
break;
}
}
if (connect(sd, (struct sockaddr *)&server,
sizeof(server)) == 0)
{
@@ -393,6 +391,7 @@ netbeans_connect(char *params, int doabort)
/* 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 @@ netbeans_connect(char *params, int doabort)
{
nbdebug(("Cannot connect to Netbeans\n"));
PERROR(_("Cannot connect to Netbeans"));
sock_close(sd);
if (doabort)
getout(1);
goto theend;

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
96,
/**/
95,
/**/