[Emacs-diffs] emacs etc/NEWS src/ChangeLog src/process.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/03 19:01:38

Modified files:
        etc            : NEWS 
        src            : ChangeLog process.c 

Log message:
        (Fmake_network_process): Fix up the tests for
        "connectionless socket", so they DTRT for seqpacket sockets as well.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2134&r2=1.2135
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7905&r2=1.7906
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&r1=1.606&r2=1.607

Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2134
retrieving revision 1.2135
diff -u -b -r1.2134 -r1.2135
--- etc/NEWS    3 Dec 2009 07:46:13 -0000       1.2134
+++ etc/NEWS    3 Dec 2009 19:01:36 -0000       1.2135
@@ -354,6 +354,8 @@
 
 * Lisp changes in Emacs 23.2
 
+** make-network-socket can now also create `seqpacket' Unix sockets.
+
 ** New function `completion-in-region' to use the standard completion
 facilities on a particular region of text.
 

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7905
retrieving revision 1.7906
diff -u -b -r1.7905 -r1.7906
--- src/ChangeLog       3 Dec 2009 18:51:32 -0000       1.7905
+++ src/ChangeLog       3 Dec 2009 19:01:37 -0000       1.7906
@@ -1,3 +1,8 @@
+2009-12-03  Daniel Hackney  <address@hidden>  (tiny change)
+
+       * process.c (Fmake_network_process): Fix up the tests for
+       "connectionless socket", so they DTRT for seqpacket sockets as well.
+
 2009-12-03  Stefan Monnier  <address@hidden>
 
        * process.c (Qseqpacket): New symbol.

Index: src/process.c
===================================================================
RCS file: /sources/emacs/emacs/src/process.c,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -b -r1.606 -r1.607
--- src/process.c       3 Dec 2009 18:51:34 -0000       1.606
+++ src/process.c       3 Dec 2009 19:01:38 -0000       1.607
@@ -3333,7 +3333,7 @@
   QCaddress = is_server ? QClocal : QCremote;
 
   /* :nowait BOOL */
-  if (!is_server && socktype == SOCK_STREAM
+  if (!is_server && socktype != SOCK_DGRAM
       && (tem = Fplist_get (contact, QCnowait), !NILP (tem)))
     {
 #ifndef NON_BLOCKING_CONNECT
@@ -3428,7 +3428,7 @@
      Some kernels have a bug which causes retrying connect to fail
      after a connect.  Polling can interfere with gethostbyname too.  */
 #ifdef POLL_FOR_INPUT
-  if (socktype == SOCK_STREAM)
+  if (socktype != SOCK_DGRAM)
     {
       record_unwind_protect (unwind_stop_other_atimers, Qnil);
       bind_polling_period (10);
@@ -3631,7 +3631,7 @@
            }
 #endif
 
-         if (socktype == SOCK_STREAM && listen (s, backlog))
+         if (socktype != SOCK_DGRAM && listen (s, backlog))
            report_file_error ("Cannot listen on server socket", Qnil);
 
          break;
@@ -3794,7 +3794,7 @@
   p->pid = 0;
   p->infd  = inch;
   p->outfd = outch;
-  if (is_server && socktype == SOCK_STREAM)
+  if (is_server && socktype != SOCK_DGRAM)
     p->status = Qlisten;
 
   /* Make the process marker point into the process buffer (if any).  */