mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00
Code Issues Projects Releases Wiki Activity

(Fmake_network_process): Fix up the tests for

Browse source 
"connectionless socket", so they DTRT for seqpacket sockets as well.
This commit is contained in:
Stefan Monnier 2009-12-03 19:01:36 +00:00
parent f00c449ba1
commit 84b318269c
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/NEWS
View file

@ -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.

5
src/ChangeLog
View file

@ -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.

8
src/process.c
View file

@ -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). */