comparison src/process.c @ 103621:444861df76cd

Simplify last change.

103620:70e98b9afe06

{
  /* Use volatile to protect variables from being clobbered by longjmp.  */
  struct Lisp_Process *p = XPROCESS (proc);
  int rv;
  struct coding_system *coding;
  struct gcpro gcpro1, gcpro2;
  SIGTYPE (*volatile old_sigpipe) ();
  Lisp_Object dst_object = Qnil;

  GCPRO2 (object, dst_object);

  if (p->raw_status_new)
    update_status (p);
  if (! EQ (p->status, Qrun))
    error ("Process %s not running", SDATA (p->name));

	  coding->dst_object = make_unibyte_string (buf, len);
	  coding->produced = len;
	}

      len = coding->produced;
      dst_object = coding->dst_object;
      buf = SDATA (dst_object);
    }

  if (pty_max_bytes == 0)
    {
#if defined (HAVE_FPATHCONF) && defined (_PC_MAX_CANON)

			}
#endif /* BROKEN_PTY_READ_AFTER_EAGAIN */

		      /* Running filters might relocate buffers or strings.
			 Arrange to relocate BUF.  */
		      if (CODING_REQUIRE_ENCODING (coding))
			offset = buf - SDATA (dst_object);
		      else if (BUFFERP (object))
			offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
		      else if (STRINGP (object))
			offset = buf - SDATA (object);

#ifdef EMACS_HAS_USECS
		      wait_reading_process_output (0, 20000, 0, 0, Qnil, NULL, 0);
#else
		      wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
#endif

		      if (CODING_REQUIRE_ENCODING (coding))
			buf = offset + SDATA (dst_object);
		      else if (BUFFERP (object))
			buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
		      else if (STRINGP (object))
			buf = offset + SDATA (object);

		      rv = 0;

103621:444861df76cd

{
  /* Use volatile to protect variables from being clobbered by longjmp.  */
  struct Lisp_Process *p = XPROCESS (proc);
  int rv;
  struct coding_system *coding;
  struct gcpro gcpro1;
  SIGTYPE (*volatile old_sigpipe) ();

  GCPRO1 (object);

  if (p->raw_status_new)
    update_status (p);
  if (! EQ (p->status, Qrun))
    error ("Process %s not running", SDATA (p->name));

	  coding->dst_object = make_unibyte_string (buf, len);
	  coding->produced = len;
	}

      len = coding->produced;
      object = coding->dst_object;
      buf = SDATA (object);
    }

  if (pty_max_bytes == 0)
    {
#if defined (HAVE_FPATHCONF) && defined (_PC_MAX_CANON)

			}
#endif /* BROKEN_PTY_READ_AFTER_EAGAIN */

		      /* Running filters might relocate buffers or strings.
			 Arrange to relocate BUF.  */
		      if (BUFFERP (object))
			offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
		      else if (STRINGP (object))
			offset = buf - SDATA (object);

#ifdef EMACS_HAS_USECS
		      wait_reading_process_output (0, 20000, 0, 0, Qnil, NULL, 0);
#else
		      wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
#endif

		      if (BUFFERP (object))
			buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
		      else if (STRINGP (object))
			buf = offset + SDATA (object);

		      rv = 0;