comparison src/callproc.c @ 20724:e34b99d443b1

(Fcall_process): Use raw-text instead of emacs-mule when enable-multibyte-characters is nil. Adjusted for the change of encode_coding and decode_coding.

20723:a0df1e68fc76

      {
	val = Qnil;
	if (!NILP (Vcoding_system_for_read))
	  val = Vcoding_system_for_read;
	else if (NILP (current_buffer->enable_multibyte_characters))
	  val = Qemacs_mule;
	else
	  {
	    if (!EQ (coding_systems, Qt))
	      {
		args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);

	  for (i = 4; i < nargs; i++)
	    {
	      int size = encoding_buffer_size (&argument_coding,
					       XSTRING (args[i])->size_byte);
	      unsigned char *dummy1 = (unsigned char *) alloca (size);
	      int produced, dummy;

	      /* The Irix 4.0 compiler barfs if we eliminate dummy.  */
	      new_argv[i - 3] = dummy1;
	      produced = encode_coding (&argument_coding,
					XSTRING (args[i])->data,
					new_argv[i - 3],
					XSTRING (args[i])->size_byte,
					size, &dummy);
	      new_argv[i - 3][produced] = 0;
	    }
	  UNGCPRO;
	}
      new_argv[nargs - 3] = 0;
    }

  {
    register int nread;
    int first = 1;
    int total_read = 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 = process_coding.carryover_size; /* This value is initially 0. */
	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)

	  }

      give_up_1:

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

	immediate_quit = 0;
	total_read += nread;
	
	if (!NILP (buffer))
	  {
	    if (process_coding.type == coding_type_no_conversion)
	      insert (bufptr, nread);
	    else
	      {			/* We have to decode the input.  */
		int size = decoding_buffer_size (&process_coding, bufsize);
		char *decoding_buf = get_conversion_buffer (size);
		int dummy;

		nread = decode_coding (&process_coding, bufptr, decoding_buf,
				       nread, size, &dummy);
		if (nread > 0)
		  insert (decoding_buf, nread);
	      }
	  }

	if (process_coding.last_block)
	  break;

	/* Make the buffer bigger as we continue to read more data,
	   but not past 64k.  */
	if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
	  {
	    bufsize *= 2;
	    bufptr = (char *) alloca (bufsize);
	  }

	if (!NILP (buffer) && process_coding.carryover_size > 0)
	  /* We have carryover in the last decoding.  It should be
             processed again after reading more data.  */
	  bcopy (process_coding.carryover, bufptr,
		 process_coding.carryover_size);

	if (!NILP (display) && INTERACTIVE)
	  {
	    if (first)
	      prepare_menu_bars ();

20724:e34b99d443b1

      {
	val = Qnil;
	if (!NILP (Vcoding_system_for_read))
	  val = Vcoding_system_for_read;
	else if (NILP (current_buffer->enable_multibyte_characters))
	  val = Qraw_text;
	else
	  {
	    if (!EQ (coding_systems, Qt))
	      {
		args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);

	  for (i = 4; i < nargs; i++)
	    {
	      int size = encoding_buffer_size (&argument_coding,
					       XSTRING (args[i])->size_byte);
	      unsigned char *dummy1 = (unsigned char *) alloca (size);
	      int dummy;

	      /* The Irix 4.0 compiler barfs if we eliminate dummy.  */
	      new_argv[i - 3] = dummy1;
	      encode_coding (&argument_coding,
			     XSTRING (args[i])->data,
			     new_argv[i - 3],
			     XSTRING (args[i])->size_byte,
			     size);
	      new_argv[i - 3][argument_coding.produced] = 0;
	    }
	  UNGCPRO;
	}
      new_argv[nargs - 3] = 0;
    }

  {
    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)

	  }

      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);
	    else
	      {			/* We have to decode the input.  */
		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 = process_coding.produced - process_coding.consumed;
		if (carryover > 0)
		  {
		    /* As CARRYOVER should not be that large, we had
		       better avoid overhead of bcopy.  */
		    char *p = bufptr + process_coding.consumed;
		    char *pend = p + carryover;
		    char *dst = bufptr;

		    while (p < pend) *dst++ = *p++;
		  }
	      }
	  }
	if (process_coding.mode & CODING_MODE_LAST_BLOCK)
	  {
	    if (carryover > 0)
	      insert (bufptr, carryover);
	    break;
	  }

	/* Make the buffer bigger as we continue to read more data,
	   but not past 64k.  */
	if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
	  {
	    bufsize *= 2;
	    bufptr = (char *) alloca (bufsize);
	  }

	if (!NILP (display) && INTERACTIVE)
	  {
	    if (first)
	      prepare_menu_bars ();