comparison src/process.c @ 30580:5d92193ed196

(read_process_output): Big simplification. Handle composition and post-read-conversion of coding system correctly. (send_process): Handle composition correctly.

30579:13339fe0bdc0

     Lisp_Object proc;
     register int channel;
{
  register int nchars, nbytes;
  char *chars;
#ifdef VMS
  int chars_allocated = 0;	/* If 1, `chars' should be freed later.  */
#else
  char buf[1024];
#endif
  register Lisp_Object outstream;
  register struct buffer *old = current_buffer;
  register struct Lisp_Process *p = XPROCESS (proc);
  register int opoint;
  struct coding_system *coding = proc_decode_coding_system[channel];
  int chars_in_decoding_buf = 0; /* If 1, `chars' points
				    XSTRING (p->decoding_buf)->data.  */
  int carryover = XINT (p->decoding_carryover);
  int require_decoding;

#ifdef VMS
  VMS_PROC_STUFF *vs, *get_vms_process_pointer();

  vs = get_vms_process_pointer (p->pid);

  if (carryover > 0)
    {
      /* The data carried over in the previous decoding (which are at
         the tail of decoding buffer) should be prepended to the new
         data read to decode all together.  */
      char *buf = (char *) xmalloc (nbytes + carryover);

      bcopy (XSTRING (p->decoding_buf)->data
	     + STRING_BYTES (XSTRING (p->decoding_buf)) - carryover,
	     buf, carryover);
      bcopy (chars, buf + carryover, nbytes);
      chars = buf;
      chars_allocated = 1;
    }
#else /* not VMS */

  if (carryover)
    /* See the comment above.  */
    bcopy (XSTRING (p->decoding_buf)->data
	   + STRING_BYTES (XSTRING (p->decoding_buf)) - carryover,
	   buf, carryover);

  if (proc_buffered_char[channel] < 0)
    nbytes = emacs_read (channel, buf + carryover, (sizeof buf) - carryover);
  else
    {
      buf[carryover] = proc_buffered_char[channel];
      proc_buffered_char[channel] = -1;
      nbytes = emacs_read (channel, buf + carryover + 1,
			   (sizeof buf) - carryover - 1);
      if (nbytes < 0)
	nbytes = 1;
      else
	nbytes = nbytes + 1;
    }
  chars = buf;
#endif /* not VMS */

  XSETINT (p->decoding_carryover, 0);

  /* At this point, NBYTES holds number of characters just received
     (including the one in proc_buffered_char[channel]).  */
  if (nbytes <= 0)
    {
      if (nbytes < 0 || coding->mode & CODING_MODE_LAST_BLOCK)
	return nbytes;

    }

  /* Now set NBYTES how many bytes we must decode.  */
  nbytes += carryover;

  require_decoding = 1;
  coding->src_multibyte = 0;
  /* Decide the multibyteness of the decoded text.  */
  if (!NILP (p->filter))
    /* We make a string given to the process filter.  The
       multibyteness is decided by which coding system we use for
       decoding.  */
    coding->dst_multibyte = (coding->type != coding_type_no_conversion
			     && coding->type != coding_type_raw_text);
  else if (!NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name))
    /* The decoded text is inserted in a buffer.  The multibyteness is
       decided by that of the buffer.  */
    coding->dst_multibyte
      = !NILP (XBUFFER (p->buffer)->enable_multibyte_characters);
  else
    /* We can discard the source, thus no need of decoding.  */
    require_decoding = 0;

  if (require_decoding
      || CODING_MAY_REQUIRE_DECODING (coding))
    {
      int require = decoding_buffer_size (coding, nbytes);
      int dst_bytes = STRING_BYTES (XSTRING (p->decoding_buf));
      int result;
      
      if (dst_bytes < require)
	p->decoding_buf = make_uninit_string (require), dst_bytes = require;
      result = decode_coding (coding, chars, XSTRING (p->decoding_buf)->data,
			      nbytes, dst_bytes);
      carryover = nbytes - coding->consumed;
      if (carryover > 0)
	{
	  /* Copy the carryover bytes to the end of p->decoding_buf, to
	     be processed on the next read.  Since decoding_buffer_size
	     asks for an extra amount of space beyond the maximum
	     expected for the output, there should always be sufficient
	     space for the carryover (which is by definition a sequence
	     of bytes that was not long enough to be decoded, and thus
	     has a bounded length).  */
	  if (dst_bytes < coding->produced + carryover)
	    abort ();
	  bcopy (chars + coding->consumed,
		 XSTRING (p->decoding_buf)->data + dst_bytes - carryover,
		 carryover);
	  XSETINT (p->decoding_carryover, carryover);
	}

      /* A new coding system might be found by `decode_coding'.  */
      if (!EQ (p->decode_coding_system, coding->symbol))
	{
	  p->decode_coding_system = coding->symbol;

	  /* Don't call setup_coding_system for
             proc_decode_coding_system[channel] here.  It is done in
             detect_coding called via decode_coding above.  */

	  /* If a coding system for encoding is not yet decided, we set
	     it as the same as coding-system for decoding.

	     But, before doing that we must check if

	      setup_coding_system (coding->symbol,
				   proc_encode_coding_system[XINT (p->outfd)]);
	    }
	}

#ifdef VMS
      /*  Now we don't need the contents of `chars'.  */
      if (chars_allocated)
	xfree (chars);
#endif
      if (coding->produced == 0)
	return 0;
      chars = (char *) XSTRING (p->decoding_buf)->data;
      nbytes = coding->produced;
      nchars = coding->produced_char;
      chars_in_decoding_buf = 1;
    }
  else
    {
#ifdef VMS
      if (chars_allocated)
	{
	  /* Although we don't have to decode the received data, we
	     must move it to an area which we don't have to free.  */
	  if (! STRINGP (p->decoding_buf)
	      || STRING_BYTES (XSTRING (p->decoding_buf)) < nbytes)
	    p->decoding_buf = make_uninit_string (nbytes);
	  bcopy (chars, XSTRING (p->decoding_buf)->data, nbytes);
	  free (chars);
	  chars_in_decoding_buf = 1;
	}
#endif
      nchars = nbytes;
    }

  Vlast_coding_system_used = coding->symbol;

  /* If the caller required, let the process associated buffer
     inherit the coding-system used to decode the process output.  */
  if (! NILP (p->inherit_coding_system_flag)
      && !NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name))
    {
      struct buffer *prev_buf = current_buffer;

      Fset_buffer (p->buffer);
      call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
	     make_number (nbytes));
      set_buffer_internal (prev_buf);
    }

  /* Read and dispose of the process output.  */
  outstream = p->filter;
  if (!NILP (outstream))
    {
      /* We inhibit quit here instead of just catching it so that 
	 hitting ^G when a filter happens to be running won't screw
	 it up.  */
      int count = specpdl_ptr - specpdl;
      Lisp_Object odeactivate;
      Lisp_Object obuffer, okeymap;
      Lisp_Object text;
      int outer_running_asynch_code = running_asynch_code;
      int waiting = waiting_for_user_input_p;

      /* No need to gcpro these, because all we do with them later
	 is test them for EQness, and none of them should be a string.  */
      odeactivate = Vdeactivate_mark;
      XSETBUFFER (obuffer, current_buffer);
      okeymap = current_buffer->keymap;

      specbind (Qinhibit_quit, Qt);
      specbind (Qlast_nonmenu_event, Qt);

      /* In case we get recursively called,
	 and we already saved the match data nonrecursively,
	 save the same match data in safely recursive fashion.  */
      if (outer_running_asynch_code)
	{
	  Lisp_Object tem;
	  /* Don't clobber the CURRENT match data, either!  */
	  tem = Fmatch_data (Qnil, Qnil);
	  restore_match_data ();
	  record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
	  Fset_match_data (tem);
	}

      /* For speed, if a search happens within this code,
	 save the match data in a special nonrecursive fashion.  */
      running_asynch_code = 1;

      /* The multibyteness of a string given to the filter is decided
         by which coding system we used for decoding.  */
      if (coding->dst_multibyte)
	text = make_multibyte_string (chars, nchars, nbytes);
      else
	text = make_unibyte_string (chars, nbytes);

      internal_condition_case_1 (read_process_output_call,
				 Fcons (outstream,
					Fcons (proc, Fcons (text, Qnil))),
				 !NILP (Vdebug_on_error) ? Qnil : Qerror,
				 read_process_output_error_handler);

      int old_begv, old_zv;
      int old_begv_byte, old_zv_byte;
      Lisp_Object odeactivate;
      int before, before_byte;
      int opoint_byte;

      odeactivate = Vdeactivate_mark;

      Fset_buffer (p->buffer);
      opoint = PT;

      /* If the output marker is outside of the visible region, save
	 the restriction and widen.  */
      if (! (BEGV <= PT && PT <= ZV))
	Fwiden ();

      /* If the text to insert is in decoding buffer (Lisp String), we
	 must move it to a relocation-free memory space.  */
      if (chars_in_decoding_buf)
	{
	  chars = (char *) alloca (nbytes);
	  bcopy (XSTRING (p->decoding_buf)->data, chars, nbytes);
	}

      /* Insert before markers in case we are inserting where
	 the buffer's mark is, and the user's next command is Meta-y.  */
      insert_1_both (chars, nchars, nbytes, 0, 1, 1);
      signal_after_change (before, 0, PT - before);
      update_compositions (before, PT, CHECK_BORDER);

      set_marker_both (p->mark, p->buffer, PT, PT_BYTE);

{
  /* Use volatile to protect variables from being clobbered by longjmp.  */
  int rv;
  struct coding_system *coding;
  struct gcpro gcpro1;
  int carryover = XINT (XPROCESS (proc)->encoding_carryover);
  int require_encoding;

  GCPRO1 (object);

#ifdef VMS
  struct Lisp_Process *p = XPROCESS (proc);

	   XSTRING (XPROCESS (proc)->name)->data);

  coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
  Vlast_coding_system_used = coding->symbol;

  require_encoding = 0;
  if (STRINGP (object) && STRING_MULTIBYTE (object))
    coding->src_multibyte = require_encoding = 1;
  else if (BUFFERP (object)
	   && !NILP (XBUFFER (object)->enable_multibyte_characters))
    coding->src_multibyte = require_encoding = 1;
  else
    require_encoding = 0;
  coding->dst_multibyte = 0;

  if (require_encoding
      || CODING_REQUIRE_ENCODING (coding))
    {
      int require = encoding_buffer_size (coding, len);
      int offset;
      unsigned char *temp_buf = NULL;

      /* Remember the offset of data because a string or a buffer may
         be relocated.  Setting OFFSET to -1 means we don't have to
         care about relocation.  */
      offset = (BUFFERP (object)
		? BUF_PTR_BYTE_POS (XBUFFER (object), buf)
		: (STRINGP (object)
		   ? buf - XSTRING (object)->data
		   : -1));

      if (carryover > 0)
	{
	  temp_buf = (unsigned char *) xmalloc (len + carryover);

	  if (offset >= 0)
	    {
	      if (BUFFERP (object))
		buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
	      else if (STRINGP (object))
		buf = offset + XSTRING (object)->data;
	      /* Now we don't have to care about relocation.  */
	      offset = -1;
	    }
	  bcopy ((XSTRING (XPROCESS (proc)->encoding_buf)->data
		  + STRING_BYTES (XSTRING (XPROCESS (proc)->encoding_buf))
		  - carryover),
		 temp_buf,
		 carryover);
	  bcopy (buf, temp_buf + carryover, len);
	  buf = temp_buf;
	}

      if (STRING_BYTES (XSTRING (XPROCESS (proc)->encoding_buf)) < require)
	{
	  XPROCESS (proc)->encoding_buf = make_uninit_string (require);

	  if (offset >= 0)
	    {
	      if (BUFFERP (object))
		buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
	      else if (STRINGP (object))
		buf = offset + XSTRING (object)->data;
	    }
	}
      object = XPROCESS (proc)->encoding_buf;
      encode_coding (coding, buf, XSTRING (object)->data,
		     len, STRING_BYTES (XSTRING (object)));
      len = coding->produced;
      buf = XSTRING (object)->data;

30580:5d92193ed196

     Lisp_Object proc;
     register int channel;
{
  register int nchars, nbytes;
  char *chars;
  register Lisp_Object outstream;
  register struct buffer *old = current_buffer;
  register struct Lisp_Process *p = XPROCESS (proc);
  register int opoint;
  struct coding_system *coding = proc_decode_coding_system[channel];
  int carryover = XINT (p->decoding_carryover);

#ifdef VMS
  VMS_PROC_STUFF *vs, *get_vms_process_pointer();

  vs = get_vms_process_pointer (p->pid);

  if (carryover > 0)
    {
      /* The data carried over in the previous decoding (which are at
         the tail of decoding buffer) should be prepended to the new
         data read to decode all together.  */
      chars = (char *) alloca (nbytes + carryover);
      bcopy (XSTRING (p->decoding_buf)->data, buf, carryover);
      bcopy (vs->inputBuffer, chars + carryover, nbytes);
    }
#else /* not VMS */
  chars = (char *) alloca (carryover + 1024);
  if (carryover)
    /* See the comment above.  */
    bcopy (XSTRING (p->decoding_buf)->data, chars, carryover);

  if (proc_buffered_char[channel] < 0)
    nbytes = emacs_read (channel, chars + carryover, 1024 - carryover);
  else
    {
      chars[carryover] = proc_buffered_char[channel];
      proc_buffered_char[channel] = -1;
      nbytes = emacs_read (channel, chars + carryover + 1,  1023 - carryover);
      if (nbytes < 0)
	nbytes = 1;
      else
	nbytes = nbytes + 1;
    }
#endif /* not VMS */

  XSETINT (p->decoding_carryover, 0);

  /* At this point, NBYTES holds number of bytes just received
     (including the one in proc_buffered_char[channel]).  */
  if (nbytes <= 0)
    {
      if (nbytes < 0 || coding->mode & CODING_MODE_LAST_BLOCK)
	return nbytes;

    }

  /* Now set NBYTES how many bytes we must decode.  */
  nbytes += carryover;

  /* Read and dispose of the process output.  */
  outstream = p->filter;
  if (!NILP (outstream))
    {
      /* We inhibit quit here instead of just catching it so that 
	 hitting ^G when a filter happens to be running won't screw
	 it up.  */
      int count = specpdl_ptr - specpdl;
      Lisp_Object odeactivate;
      Lisp_Object obuffer, okeymap;
      Lisp_Object text;
      int outer_running_asynch_code = running_asynch_code;
      int waiting = waiting_for_user_input_p;

      /* No need to gcpro these, because all we do with them later
	 is test them for EQness, and none of them should be a string.  */
      odeactivate = Vdeactivate_mark;
      XSETBUFFER (obuffer, current_buffer);
      okeymap = current_buffer->keymap;

      specbind (Qinhibit_quit, Qt);
      specbind (Qlast_nonmenu_event, Qt);

      /* In case we get recursively called,
	 and we already saved the match data nonrecursively,
	 save the same match data in safely recursive fashion.  */
      if (outer_running_asynch_code)
	{
	  Lisp_Object tem;
	  /* Don't clobber the CURRENT match data, either!  */
	  tem = Fmatch_data (Qnil, Qnil);
	  restore_match_data ();
	  record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
	  Fset_match_data (tem);
	}

      /* For speed, if a search happens within this code,
	 save the match data in a special nonrecursive fashion.  */
      running_asynch_code = 1;

      text = decode_coding_string (make_unibyte_string (chars, nbytes),
				   coding, 0);
      /* A new coding system might be found.  */
      if (!EQ (p->decode_coding_system, coding->symbol))
	{
	  p->decode_coding_system = coding->symbol;

	  /* Don't call setup_coding_system for
	     proc_decode_coding_system[channel] here.  It is done in
	     detect_coding called via decode_coding above.  */

	  /* If a coding system for encoding is not yet decided, we set
	     it as the same as coding-system for decoding.

	     But, before doing that we must check if

	      setup_coding_system (coding->symbol,
				   proc_encode_coding_system[XINT (p->outfd)]);
	    }
	}

      carryover = nbytes - coding->consumed;
      bcopy (chars + coding->consumed, XSTRING (p->decoding_buf)->data,
	     carryover);
      XSETINT (p->decoding_carryover, carryover);
      nbytes = STRING_BYTES (XSTRING (text));
      nchars = XSTRING (text)->size;
      internal_condition_case_1 (read_process_output_call,
				 Fcons (outstream,
					Fcons (proc, Fcons (text, Qnil))),
				 !NILP (Vdebug_on_error) ? Qnil : Qerror,
				 read_process_output_error_handler);

      int old_begv, old_zv;
      int old_begv_byte, old_zv_byte;
      Lisp_Object odeactivate;
      int before, before_byte;
      int opoint_byte;
      Lisp_Object text;

      odeactivate = Vdeactivate_mark;

      Fset_buffer (p->buffer);
      opoint = PT;

      /* If the output marker is outside of the visible region, save
	 the restriction and widen.  */
      if (! (BEGV <= PT && PT <= ZV))
	Fwiden ();

      /* Insert before markers in case we are inserting where
	 the buffer's mark is, and the user's next command is Meta-y.  */
      text = decode_coding_string (make_unibyte_string (chars, nbytes),
				   coding, 0);
      /* A new coding system might be found.  See the comment in the
	 similar code in the previous `if' block.  */
      if (!EQ (p->decode_coding_system, coding->symbol))
	{
	  p->decode_coding_system = coding->symbol;
	  if (NILP (p->encode_coding_system)
	      && proc_encode_coding_system[XINT (p->outfd)])
	    {
	      p->encode_coding_system = coding->symbol;
	      setup_coding_system (coding->symbol,
				   proc_encode_coding_system[XINT (p->outfd)]);
	    }
	}
      carryover = nbytes - coding->consumed;
      bcopy (chars + coding->consumed, XSTRING (p->decoding_buf)->data,
	     carryover);
      XSETINT (p->decoding_carryover, carryover);
      nbytes = STRING_BYTES (XSTRING (text));
      nchars = XSTRING (text)->size;
      insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0);
      signal_after_change (before, 0, PT - before);
      update_compositions (before, PT, CHECK_BORDER);

      set_marker_both (p->mark, p->buffer, PT, PT_BYTE);

{
  /* Use volatile to protect variables from being clobbered by longjmp.  */
  int rv;
  struct coding_system *coding;
  struct gcpro gcpro1;

  GCPRO1 (object);

#ifdef VMS
  struct Lisp_Process *p = XPROCESS (proc);

	   XSTRING (XPROCESS (proc)->name)->data);

  coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
  Vlast_coding_system_used = coding->symbol;

  if ((STRINGP (object) && STRING_MULTIBYTE (object))
      || (BUFFERP (object)
	  && !NILP (XBUFFER (object)->enable_multibyte_characters)))
    coding->src_multibyte = 1;
  coding->dst_multibyte = 0;

  if (CODING_REQUIRE_ENCODING (coding))
    {
      int require = encoding_buffer_size (coding, len);
      int from_byte = -1, from, to;
      unsigned char *temp_buf = NULL;

      if (BUFFERP (object))
	{
	  from_byte = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
	  from = buf_bytepos_to_charpos (XBUFFER (object), from_byte);
	  to = buf_bytepos_to_charpos (XBUFFER (object), from_byte + len);
	}
      else if (STRINGP (object))
	{
	  from_byte = buf - XSTRING (object)->data;
	  from = string_byte_to_char (object, from_byte);
	  to =  string_byte_to_char (object, from_byte + len);
	}

      if (from_byte >= 0 && coding->composing != COMPOSITION_DISABLED)
	coding_save_composition (coding, from, to, object);

      if (STRING_BYTES (XSTRING (XPROCESS (proc)->encoding_buf)) < require)
	XPROCESS (proc)->encoding_buf = make_uninit_string (require);

      if (from_byte >= 0)
	buf = (BUFFERP (object)
	       ? BUF_BYTE_ADDRESS (XBUFFER (object), from_byte)
	       : XSTRING (object)->data + from_byte);

      object = XPROCESS (proc)->encoding_buf;
      encode_coding (coding, buf, XSTRING (object)->data,
		     len, STRING_BYTES (XSTRING (object)));
      len = coding->produced;
      buf = XSTRING (object)->data;