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

[Kim F. Storm]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.389 emacs/src/process.c:1.390
*** emacs/src/process.c:1.389   Wed Jan  8 05:38:06 2003
--- emacs/src/process.c Wed Jan  8 10:35:03 2003
***************
*** 1052,1062 ****
  
  #ifdef HAVE_SOCKETS
  DEFUN ("format-network-address", Fformat_network_address, 
Sformat_network_address,
!        1, 1, 0,
         doc: /* Convert network ADDRESS from internal format to a string.
! Returns nil if format of ADDRESS is invalid.  */)
!      (address)
!      Lisp_Object address;
  {
    if (NILP (address))
      return Qnil;
--- 1052,1064 ----
  
  #ifdef HAVE_SOCKETS
  DEFUN ("format-network-address", Fformat_network_address, 
Sformat_network_address,
!        1, 2, 0,
         doc: /* Convert network ADDRESS from internal format to a string.
! If optional second argument OMIT-PORT is non-nil, don't include a port
! number in the string; in this case, interpret a 4 element vector as an
! IP address.  Returns nil if format of ADDRESS is invalid.  */)
!      (address, omit_port)
!      Lisp_Object address, omit_port;
  {
    if (NILP (address))
      return Qnil;
***************
*** 1068,1084 ****
      {
        register struct Lisp_Vector *p = XVECTOR (address);
        Lisp_Object args[6];
  
!       if (p->size != 5)
        return Qnil;
  
!       args[0] = build_string ("%d.%d.%d.%d:%d");
!       args[1] = p->contents[0];
!       args[2] = p->contents[1];
!       args[3] = p->contents[2];
!       args[4] = p->contents[3];
!       args[5] = p->contents[4];
!       return Fformat (6, args);
      }
  
    if (CONSP (address))
--- 1070,1093 ----
      {
        register struct Lisp_Vector *p = XVECTOR (address);
        Lisp_Object args[6];
+       int nargs, i;
  
!       if (!NILP (omit_port) && (p->size == 4 || p->size == 5))
!       {
!         args[0] = build_string ("%d.%d.%d.%d");
!         nargs = 4;
!       }
!       else if (p->size == 5)
!       {
!         args[0] = build_string ("%d.%d.%d.%d:%d");
!         nargs = 5;
!       }
!       else
        return Qnil;
  
!       for (i = 0; i < nargs; i++)
!       args[i+1] = p->contents[i];
!       return Fformat (nargs+1, args);
      }
  
    if (CONSP (address))
***************
*** 1255,1261 ****
          if (INTEGERP (port))
            port = Fnumber_to_string (port);
          if (NILP (port))
!           port = Fformat_network_address (Fplist_get (p->childp, QClocal));
          sprintf (tembuf, "(network %s server on %s)\n",
                   (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   (STRINGP (port) ? (char *)SDATA (port) : "?"));
--- 1264,1270 ----
          if (INTEGERP (port))
            port = Fnumber_to_string (port);
          if (NILP (port))
!           port = Fformat_network_address (Fplist_get (p->childp, QClocal), 
Qnil);
          sprintf (tembuf, "(network %s server on %s)\n",
                   (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   (STRINGP (port) ? (char *)SDATA (port) : "?"));
***************
*** 1273,1279 ****
                host = Fnumber_to_string (host);
            }
          if (NILP (host))
!           host = Fformat_network_address (Fplist_get (p->childp, QCremote));
          sprintf (tembuf, "(network %s connection to %s)\n",
                   (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   (STRINGP (host) ? (char *)SDATA (host) : "?"));
--- 1282,1288 ----
                host = Fnumber_to_string (host);
            }
          if (NILP (host))
!           host = Fformat_network_address (Fplist_get (p->childp, QCremote), 
Qnil);
          sprintf (tembuf, "(network %s connection to %s)\n",
                   (DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
                   (STRINGP (host) ? (char *)SDATA (host) : "?"));