Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv22030
Modified Files:
network.scm scsh-interfaces.scm
Log Message:
Renamed fd->socket to port->socket and added better checking for being a socket.
Index: network.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network.scm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** network.scm 2001/04/02 14:57:25 1.15
--- network.scm 2001/06/20 16:12:40 1.16
***************
*** 170,181 ****
;;; Turn a file descriptor into a socket.
- ;;; Useful if running as inetd-child
! (define (fd->socket fd pf)
! (let* ((in (make-input-fdport fd 0))
! (out (dup->outport in)))
! (set-fdes-status fd open/non-blocking) ; this raises an error if fd was
not
! ; a socket
! (set-fdes-status out open/non-blocking)
(make-socket pf in out)))
--- 170,188 ----
;;; Turn a file descriptor into a socket.
! (define (port->socket port pf)
! ;;; ensure underlying fd is a socket by a random getsockopt call
! (if (not (port? port))
! (error "first argument to port->socket is not a port" port))
! (sleazy-call/fdes
! port
! (lambda (fd)
! (%getsockopt fd level/socket socket/debug)))
! (let ((in (if (input-port? port)
! port
! (dup->inport port)))
! (out (if (output-port? port)
! port
! (dup->outport port))))
(make-socket pf in out)))
Index: scsh-interfaces.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-interfaces.scm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** scsh-interfaces.scm 2001/06/19 11:35:54 1.19
--- scsh-interfaces.scm 2001/06/20 16:12:40 1.20
***************
*** 649,653 ****
socket-address->unix-address
create-socket
! fd->socket
close-socket
bind-socket
--- 649,653 ----
socket-address->unix-address
create-socket
! port->socket
close-socket
bind-socket
|