comparison src/callproc.c @ 21966:10183730b250

(Fcall_process): If we must display received data on the fly, don't wait until a buffer is filled.

21965:3681d61e4ed8

  {
    register int nread;
    int first = 1;
    int total_read = 0;
    int carryover = 0;

    while (1)
      {
	/* Repeatedly read until we've filled as much as possible
	   of the buffer size we have.  But don't read
	   less than 1024--save that for the next bufferful.  */

	nread = carryover;
	while (nread < bufsize - 1024)
	  {
	    int this_read = read (fd[0], bufptr + nread, bufsize - nread);

	    if (this_read < 0)
	      goto give_up;

	    if (this_read == 0)
	      goto give_up_1;

	    nread += this_read;
	  }

      give_up_1:

	/* Now NREAD is the total amount of data in the buffer.  */
	if (nread == carryover)
	  /* Here, just tell decode_coding that we are processing the
             last block.  We break the loop after decoding.  */
	  process_coding.mode |= CODING_MODE_LAST_BLOCK;

	immediate_quit = 0;
	total_read += nread - carryover;
	
	if (!NILP (buffer))
	  {
	    if (process_coding.type == coding_type_no_conversion)
	      insert (bufptr, nread);

		int size = decoding_buffer_size (&process_coding, nread);
		char *decoding_buf = get_conversion_buffer (size);

		decode_coding (&process_coding, bufptr, decoding_buf,
			       nread, size);
		if (process_coding.produced > 0)
		  insert (decoding_buf, process_coding.produced);
		carryover = nread - process_coding.consumed;
		if (carryover > 0)
		  {

21966:10183730b250

  {
    register int nread;
    int first = 1;
    int total_read = 0;
    int carryover = 0;
    int display_on_the_fly = !NILP (display) && INTERACTIVE;
    struct coding_system saved_coding = process_coding;

    while (1)
      {
	/* Repeatedly read until we've filled as much as possible
	   of the buffer size we have.  But don't read
	   less than 1024--save that for the next bufferful.  */
	nread = carryover;
	while (nread < bufsize - 1024)
	  {
	    int this_read = read (fd[0], bufptr + nread, bufsize - nread);

	    if (this_read < 0)
	      goto give_up;

	    if (this_read == 0)
	      {
		process_coding.mode |= CODING_MODE_LAST_BLOCK;
		break;
	      }

	    nread += this_read;
	    total_read += this_read;

	    if (display_on_the_fly)
	      break;
	  }

	/* Now NREAD is the total amount of data in the buffer.  */
	immediate_quit = 0;
	
	if (!NILP (buffer))
	  {
	    if (process_coding.type == coding_type_no_conversion)
	      insert (bufptr, nread);

		int size = decoding_buffer_size (&process_coding, nread);
		char *decoding_buf = get_conversion_buffer (size);

		decode_coding (&process_coding, bufptr, decoding_buf,
			       nread, size);
		if (display_on_the_fly
		    && saved_coding.type == coding_type_undecided
		    && process_coding.type != coding_type_undecided)
		  {
		    /* We have detected some coding system.  But,
		       there's a possibility that the detection was
		       done by insufficient data.  So, we give up
		       displaying on the fly.  */
		    display_on_the_fly = 0;
		    process_coding = saved_coding;
		    carryover = nread;
		    continue;
		  }
		if (process_coding.produced > 0)
		  insert (decoding_buf, process_coding.produced);
		carryover = nread - process_coding.consumed;
		if (carryover > 0)
		  {