vim/patches/vim-7.3.096.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.096
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.096
  11 Problem:    "gvim -nb" is not interruptable.  Leaking file descriptor on
  12             netbeans connection error.
  13 Solution:   Check for CTRL-C typed.  Free file descriptor.  (Xavier de Gaye)
  14 Files:      src/netbeans.c
  15
  16
  17 *** ../vim-7.3.095/src/netbeans.c       2010-12-24 14:00:09.000000000 +0100
  18 --- src/netbeans.c      2011-01-04 18:00:35.000000000 +0100
  19 ***************
  20 *** 321,326 ****
  21 --- 321,327 ----
  22       {
  23         nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
  24         PERROR("gethostbyname() in netbeans_connect()");
  25 +       sock_close(sd);
  26         goto theend;
  27       }
  28       memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
  29 ***************
  30 *** 370,384 ****
  31                                                          || (errno == EINTR)))
  32                 {
  33                     nbdebug(("retrying...\n"));
  34 !                   sleep(5);
  35 !                   if (!doabort)
  36                     {
  37 !                       ui_breakcheck();
  38 !                       if (got_int)
  39 !                       {
  40 !                           errno = EINTR;
  41 !                           break;
  42 !                       }
  43                     }
  44                     if (connect(sd, (struct sockaddr *)&server,
  45                                                          sizeof(server)) == 0)
  46 --- 371,382 ----
  47                                                          || (errno == EINTR)))
  48                 {
  49                     nbdebug(("retrying...\n"));
  50 !                   mch_delay(3000L, TRUE);
  51 !                   ui_breakcheck();
  52 !                   if (got_int)
  53                     {
  54 !                       errno = EINTR;
  55 !                       break;
  56                     }
  57                     if (connect(sd, (struct sockaddr *)&server,
  58                                                          sizeof(server)) == 0)
  59 ***************
  60 *** 393,398 ****
  61 --- 391,397 ----
  62                     /* Get here when the server can't be found. */
  63                     nbdebug(("Cannot connect to Netbeans #2\n"));
  64                     PERROR(_("Cannot connect to Netbeans #2"));
  65 +                   sock_close(sd);
  66                     if (doabort)
  67                         getout(1);
  68                     goto theend;
  69 ***************
  70 *** 403,408 ****
  71 --- 402,408 ----
  72         {
  73             nbdebug(("Cannot connect to Netbeans\n"));
  74             PERROR(_("Cannot connect to Netbeans"));
  75 +           sock_close(sd);
  76             if (doabort)
  77                 getout(1);
  78             goto theend;
  79 *** ../vim-7.3.095/src/version.c        2011-01-04 17:49:25.000000000 +0100
  80 --- src/version.c       2011-01-04 18:09:46.000000000 +0100
  81 ***************
  82 *** 716,717 ****
  83 --- 716,719 ----
  84   {   /* Add new patch number below this line */
  85 + /**/
  86 +     96,
  87   /**/
  88
  89 --
  90 hundred-and-one symptoms of being an internet addict:
  91 85. Choice between paying Compuserve bill and paying for kids education
  92     is a no brainer -- although a bit painful for your kids.
  93
  94  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  95 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  96 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  97  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///