* process.c (Fmake_network_process): Don't apply Bug#5173 fix for Windows.

diff --git a/src/ChangeLog b/src/ChangeLog
index 789a4d93e44b871d36e99e2abe0ae69499658771..7aae2a3754f45d8ec32bd16120a8b93988a7e82f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * process.c (Fmake_network_process): Don't apply Bug#5173 fix for
+       Windows.
+
 2010-03-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * process.c (Fmake_network_process): Don't call turn_on_atimers around

diff --git a/src/process.c b/src/process.c
index 268a3ad7babecabf87bef61f6e7bd518f36489f7..4f10375229687cecdf26cd666e369a3377f13b0b 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -3534,6 +3534,8 @@ usage: (make-network-process &rest ARGS)  */)
     {
       int optn, optbits;
 
+    retry_connect:
+
       s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
       if (s < 0)
        {
@@ -3636,12 +3638,14 @@ usage: (make-network-process &rest ARGS)  */)
 #endif
 #endif
 #endif
+
+#ifndef WINDOWSNT
       if (xerrno == EINTR)
        {
          /* Unlike most other syscalls connect() cannot be called
             again.  (That would return EALREADY.)  The proper way to
             wait for completion is select(). */
-         int sc;
+         int sc, len;
          SELECT_TYPE fdset;
        retry_select:
          FD_ZERO (&fdset);
@@ -3651,23 +3655,23 @@ usage: (make-network-process &rest ARGS)  */)
                       (EMACS_TIME *)0);
          if (sc == -1)
            {
-             if (errno == EINTR) 
+             if (errno == EINTR)
                goto retry_select;
-             else 
+             else
                report_file_error ("select failed", Qnil);
            }
          eassert (sc > 0);
-         {
-           int len = sizeof xerrno;
-           eassert (FD_ISSET (s, &fdset));
-           if (getsockopt (s, SOL_SOCKET, SO_ERROR, &xerrno, &len) == -1)
-             report_file_error ("getsockopt failed", Qnil);
-           if (xerrno != 0)
-             errno = xerrno, report_file_error ("error during connect", Qnil);
-           else
-             break;
-         }
+
+         len = sizeof xerrno;
+         eassert (FD_ISSET (s, &fdset));
+         if (getsockopt (s, SOL_SOCKET, SO_ERROR, &xerrno, &len) == -1)
+           report_file_error ("getsockopt failed", Qnil);
+         if (xerrno)
+           errno = xerrno, report_file_error ("error during connect", Qnil);
+         else
+           break;
        }
+#endif /* !WINDOWSNT */
 
       immediate_quit = 0;
 
@@ -3675,6 +3679,11 @@ usage: (make-network-process &rest ARGS)  */)
       specpdl_ptr = specpdl + count1;
       emacs_close (s);
       s = -1;
+
+#ifdef WINDOWSNT
+      if (xerrno == EINTR)
+       goto retry_connect;
+#endif
     }
 
   if (s >= 0)