comparison src/process.c @ 111367:1d1b5e1c230b

Backport r99750 from trunk

111366:7be30ce79ffd

  for (lres = res; lres; lres = lres->ai_next)
    {
      int optn, optbits;

    retry_connect:

      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0)
	{
	  xerrno = errno;
	  continue;

      if (is_non_blocking_client && xerrno == EWOULDBLOCK)
	break;
#endif
#endif
#endif

      immediate_quit = 0;

      /* Discard the unwind protect closing S.  */
      specpdl_ptr = specpdl + count1;
      emacs_close (s);
      s = -1;

      if (xerrno == EINTR)
	goto retry_connect;
    }

  if (s >= 0)
    {
#ifdef DATAGRAM_SOCKETS

111367:1d1b5e1c230b

  for (lres = res; lres; lres = lres->ai_next)
    {
      int optn, optbits;

      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0)
	{
	  xerrno = errno;
	  continue;

      if (is_non_blocking_client && xerrno == EWOULDBLOCK)
	break;
#endif
#endif
#endif
      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;
	  SELECT_TYPE fdset;
	retry_select:
	  FD_ZERO (&fdset);
	  FD_SET (s, &fdset);
	  QUIT;
	  sc = select (s + 1, (SELECT_TYPE *)0, &fdset, (SELECT_TYPE *)0,
		       (EMACS_TIME *)0);
	  if (sc == -1)
	    {
	      if (errno == EINTR) 
		goto retry_select;
	      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;
	  }
	}

      immediate_quit = 0;

      /* Discard the unwind protect closing S.  */
      specpdl_ptr = specpdl + count1;
      emacs_close (s);
      s = -1;
    }

  if (s >= 0)
    {
#ifdef DATAGRAM_SOCKETS