Commit 184765cc authored by Chong Yidong's avatar Chong Yidong

Backport 2010-03-27T00:45:32Z!cyd@stupidchicken.com from trunk

parent bd80a886
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
......
......@@ -3573,6 +3573,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)
{
......@@ -3675,12 +3677,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);
......@@ -3690,23 +3694,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;
......@@ -3714,6 +3718,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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment