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

[Stefan Monnier]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.365 emacs/src/process.c:1.366
*** emacs/src/process.c:1.365   Thu Mar 28 01:42:43 2002
--- emacs/src/process.c Mon Apr  1 14:49:47 2002
***************
*** 307,313 ****
    int len;
  } datagram_address[MAXDESC];
  #define DATAGRAM_CHAN_P(chan) (datagram_address[chan].sa != 0)
! #define DATAGRAM_CONN_P(proc) (PROCESSP (proc) && datagram_address[XPROCESS 
(proc)->infd].sa != 0)
  #else
  #define DATAGRAM_CHAN_P(chan) (0)
  #define DATAGRAM_CONN_P(proc) (0)
--- 307,313 ----
    int len;
  } datagram_address[MAXDESC];
  #define DATAGRAM_CHAN_P(chan) (datagram_address[chan].sa != 0)
! #define DATAGRAM_CONN_P(proc) (PROCESSP (proc) && datagram_address[XINT 
(XPROCESS (proc)->infd)].sa != 0)
  #else
  #define DATAGRAM_CHAN_P(chan) (0)
  #define DATAGRAM_CONN_P(proc) (0)
***************
*** 1200,1206 ****
          if (INTEGERP (port))
            port = Fnumber_to_string (port);
          sprintf (tembuf, "(network %s server on %s)\n",
!                  (DATAGRAM_CHAN_P (p->infd) ? "datagram" : "stream"),
                   XSTRING (port)->data);
          insert_string (tembuf);
        }
--- 1200,1206 ----
          if (INTEGERP (port))
            port = Fnumber_to_string (port);
          sprintf (tembuf, "(network %s server on %s)\n",
!                  (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   XSTRING (port)->data);
          insert_string (tembuf);
        }
***************
*** 1216,1222 ****
                host = Fnumber_to_string (host);
            }
          sprintf (tembuf, "(network %s connection to %s)\n",
!                  (DATAGRAM_CHAN_P (p->infd) ? "datagram" : "stream"),
                   XSTRING (host)->data);
          insert_string (tembuf);
          }
--- 1216,1222 ----
                host = Fnumber_to_string (host);
            }
          sprintf (tembuf, "(network %s connection to %s)\n",
!                  (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   XSTRING (host)->data);
          insert_string (tembuf);
          }
***************
*** 2119,2125 ****
    if (!DATAGRAM_CONN_P (process))
      return Qnil;
  
!   channel = XPROCESS (process)->infd;
    return conv_sockaddr_to_lisp (datagram_address[channel].sa,
                                datagram_address[channel].len);
  }
--- 2119,2125 ----
    if (!DATAGRAM_CONN_P (process))
      return Qnil;
  
!   channel = XINT (XPROCESS (process)->infd);
    return conv_sockaddr_to_lisp (datagram_address[channel].sa,
                                datagram_address[channel].len);
  }
***************
*** 2139,2145 ****
    if (!DATAGRAM_CONN_P (process))
      return Qnil;
  
!   channel = XPROCESS (process)->infd;
  
    len = get_lisp_to_sockaddr_size (address, &family);
    if (datagram_address[channel].len != len)
--- 2139,2145 ----
    if (!DATAGRAM_CONN_P (process))
      return Qnil;
  
!   channel = XINT (XPROCESS (process)->infd);
  
    len = get_lisp_to_sockaddr_size (address, &family);
    if (datagram_address[channel].len != len)
***************
*** 2374,2383 ****
  
    process = args[0];
    CHECK_PROCESS (process);
!   if (nargs > 1 && XPROCESS (process)->infd >= 0)
      {
        opts = Flist (nargs, args);
!       set_socket_options (XPROCESS (process)->infd, opts, 0);
      }
    return process;
  }
--- 2374,2383 ----
  
    process = args[0];
    CHECK_PROCESS (process);
!   if (nargs > 1 && XINT (XPROCESS (process)->infd) >= 0)
      {
        opts = Flist (nargs, args);
!       set_socket_options (XINT (XPROCESS (process)->infd), opts, 0);
      }
    return process;
  }
***************
*** 3528,3534 ****
                      (STRINGP (host) ? host : build_string ("-")),
                      build_string ("\n")));
  
!   if (p->sentinel)
      exec_sentinel (proc, 
                   concat3 (build_string ("open from "),
                            (STRINGP (host) ? host : build_string ("-")),
--- 3528,3534 ----
                      (STRINGP (host) ? host : build_string ("-")),
                      build_string ("\n")));
  
!   if (!NILP (p->sentinel))
      exec_sentinel (proc, 
                   concat3 (build_string ("open from "),
                            (STRINGP (host) ? host : build_string ("-")),