comparison src/process.c @ 107846:e8ea73860300

Try to solve the problem of spurious EOF chars in long lines of text sent to interactive subprocesses. * sysdep.c (child_setup_tty): Do not enable ICANON any more. (system_process_attributes): Remove unused var `ttotal'. * process.c (send_process): Don't bother breaking long line with EOF chars when talking to ttys any more. (wait_reading_process_output): Output a warning when called in such a way that it could block without being interruptible.

107845:688679bd79f5

  FD_ZERO (&Available);
#ifdef NON_BLOCKING_CONNECT
  FD_ZERO (&Connecting);
#endif

  /* If wait_proc is a process to watch, set wait_channel accordingly.  */
  if (wait_proc != NULL)
    wait_channel = wait_proc->infd;

  record_unwind_protect (wait_reading_process_output_unwind,

      process_sent_to = proc;
      while (len > 0)
	{
	  int this = len;

	  /* Decide how much data we can send in one batch.
	     Long lines need to be split into multiple batches.  */
	  if (p->pty_flag)
	    {
	      /* Starting this at zero is always correct when not the first
		 iteration because the previous iteration ended by sending C-d.
		 It may not be correct for the first iteration
		 if a partial line was sent in a separate send_process call.
		 If that proves worth handling, we need to save linepos
		 in the process object.  */
	      int linepos = 0;
	      unsigned char *ptr = (unsigned char *) buf;
	      unsigned char *end = (unsigned char *) buf + len;

	      /* Scan through this text for a line that is too long.  */
	      while (ptr != end && linepos < pty_max_bytes)
		{
		  if (*ptr == '\n')
		    linepos = 0;
		  else
		    linepos++;
		  ptr++;
		}
	      /* If we found one, break the line there
		 and put in a C-d to force the buffer through.  */
	      this = ptr - buf;
	    }

	  /* Send this batch, using one or more write calls.  */
	  while (this > 0)
	    {
	      int outfd = p->outfd;
	      old_sigpipe = (SIGTYPE (*) ()) signal (SIGPIPE, send_process_trap);

		}
	      buf += rv;
	      len -= rv;
	      this -= rv;
	    }

	  /* If we sent just part of the string, put in an EOF (C-d)
	     to force it through, before we send the rest.  */
	  if (len > 0)
	    Fprocess_send_eof (proc);
	}
    }
  else
    {
      signal (SIGPIPE, old_sigpipe);

107846:e8ea73860300

  FD_ZERO (&Available);
#ifdef NON_BLOCKING_CONNECT
  FD_ZERO (&Connecting);
#endif

  if (time_limit == 0 && wait_proc && !NILP (Vinhibit_quit)
      && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit)))
    message ("Blocking call to accept-process-output with quit inhibited!!");

  /* If wait_proc is a process to watch, set wait_channel accordingly.  */
  if (wait_proc != NULL)
    wait_channel = wait_proc->infd;

  record_unwind_protect (wait_reading_process_output_unwind,

      process_sent_to = proc;
      while (len > 0)
	{
	  int this = len;

	  /* Send this batch, using one or more write calls.  */
	  while (this > 0)
	    {
	      int outfd = p->outfd;
	      old_sigpipe = (SIGTYPE (*) ()) signal (SIGPIPE, send_process_trap);

		}
	      buf += rv;
	      len -= rv;
	      this -= rv;
	    }
	}
    }
  else
    {
      signal (SIGPIPE, old_sigpipe);