Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv314
Modified Files:
network.scm
Log Message:
Removed call/cc from handler of bind-listen-accept-loop: We want to
close the socket, but not prevent the exception to come through
(Otherwise you get 'interrupted on undefined globals...).
Index: network.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network.scm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** network.scm 2001/07/04 11:54:41 1.18
--- network.scm 2001/07/10 11:26:54 1.19
***************
*** 87,108 ****
(bind-socket sock addr)
(listen-socket sock 5)
! (call-with-current-continuation
! (lambda (exit)
(with-handler
! (lambda (condition more)
! (with-handler
! (lambda (condition ignore) (more))
! (lambda () (close-socket sock)))
! (exit 'interrupted))
! (lambda ()
! (let loop ()
! (with-errno-handler
! ;; ECONNABORTED we just ignore
! ((errno packet)
! ((errno/connaborted) (loop)))
! (call-with-values
! (lambda () (accept-connection sock))
! proc)
! (loop)))))))))
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 87,106 ----
(bind-socket sock addr)
(listen-socket sock 5)
! (with-handler
! (lambda (condition more)
(with-handler
! (lambda (condition ignore) (more))
! (lambda () (close-socket sock)))
! (more))
! (lambda ()
! (let loop ()
! (with-errno-handler
! ;; ECONNABORTED we just ignore
! ((errno packet)
! ((errno/connaborted) (loop)))
! (call-with-values
! (lambda () (accept-connection sock))
! proc)
! (loop)))))))
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
|