From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 3 Dec 2009 19:01:36 +0000 (+0000)
Subject: (Fmake_network_process): Fix up the tests for
X-Git-Tag: emacs-pretest-23.1.90~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84b318269ceb95adcd16f49f6a110be04fcaeffd;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index 6717e6519c4..6e46678c22b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -354,6 +354,8 @@ the variable `byte-compile-compatibility') has been removed.
 
 * 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.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 383d13cbc07..dbe24e3a142 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  Daniel Hackney  <dan@haxney.org>  (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  <monnier@iro.umontreal.ca>
 
 	* process.c (Qseqpacket): New symbol.
diff --git a/src/process.c b/src/process.c
index 61cf86e4eb3..088997d80ac 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3333,7 +3333,7 @@ usage: (make-network-process &rest ARGS)  */)
   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 @@ usage: (make-network-process &rest ARGS)  */)
      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 @@ usage: (make-network-process &rest ARGS)  */)
 	    }
 #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 @@ usage: (make-network-process &rest ARGS)  */)
   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).  */