Re: master 6a19f2a024: Add new --timeout flag to emacsclient

[Robert Pluim <rpluim@gmail.com>]

>>>>> On Mon,  5 Sep 2022 20:05:44 -0400 (EDT), Stefan Kangas <stefankangas@gmail.com> said:
    Stefan>        do
    Stefan>  	{
    Stefan>  	  act_on_signals (emacs_socket);
    Stefan>  	  rl = recv (emacs_socket, string, BUFSIZ, 0);
    Stefan> +	  retry = check_socket_timeout (rl);
    Stefan> +	  if (retry)
    Stefan> +	    {
    Stefan> +	      if (timeout > 0 && !saw_response)
    Stefan> +		{
    Stefan> +		  /* Don't retry if we were given a --timeout flag.  */
    Stefan> +		  fprintf (stderr, "\nServer not responding; timed out after %lu seconds",
    Stefan> +			   timeout);
    Stefan> +		  retry = false;
    Stefan> +		}
    Stefan> +	      else if (!msg_showed)
    Stefan> +		{
    Stefan> +		  msg_showed = true;
    Stefan> +		  fprintf (stderr, "\nServer not responding; use Ctrl+C to break");
    Stefan> +		}
    Stefan> +	    }
    Stefan>  	}
    Stefan> -      while (rl < 0 && errno == EINTR);
    Stefan> +      while ((rl < 0 && errno == EINTR) || retry);
 
    Stefan>        if (rl <= 0)
    Stefan>          break;
 
    Stefan> +      if (msg_showed)
    Stefan> +	fprintf (stderr, "\nGot response from server");

Iʼm not sure we want to be writing to stderr every time we get a
message from the server after weʼve timed out on the initial recv.

    Stefan> +      saw_response = true;
    Stefan>        string[rl] = '\0';
 
    Stefan>        /* Loop over all NL-terminated messages.  */



Robert
--