[Emacs-diffs] Changes to emacs/src/process.c

[David Kastrup]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.403 emacs/src/process.c:1.404
*** emacs/src/process.c:1.403   Sun Mar  9 17:48:08 2003
--- emacs/src/process.c Sat May 17 16:03:22 2003
***************
*** 4463,4480 ****
    if (DATAGRAM_CHAN_P (channel))
      {
        int len = datagram_address[channel].len;
!       nbytes = recvfrom (channel, chars + carryover, readmax,
                         0, datagram_address[channel].sa, &len);
      }
    else
  #endif
    if (proc_buffered_char[channel] < 0)
!     nbytes = emacs_read (channel, chars + carryover, readmax);
    else
      {
        chars[carryover] = proc_buffered_char[channel];
        proc_buffered_char[channel] = -1;
!       nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1);
        if (nbytes < 0)
        nbytes = 1;
        else
--- 4463,4480 ----
    if (DATAGRAM_CHAN_P (channel))
      {
        int len = datagram_address[channel].len;
!       nbytes = recvfrom (channel, chars + carryover, readmax - carryover,
                         0, datagram_address[channel].sa, &len);
      }
    else
  #endif
    if (proc_buffered_char[channel] < 0)
!     nbytes = emacs_read (channel, chars + carryover, readmax - carryover);
    else
      {
        chars[carryover] = proc_buffered_char[channel];
        proc_buffered_char[channel] = -1;
!       nbytes = emacs_read (channel, chars + carryover + 1,  readmax - 1 - 
carryover);
        if (nbytes < 0)
        nbytes = 1;
        else