X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_server.scm;fp=src%2Fgacela_server.scm;h=f58c8b6399666098fd586d370e4d9b9f4158aa7a;hb=c4dbd17a165312f189ec5211069dab4d039d5471;hp=a95ec9d50d4497e707a62bdb0228c3cd64981bf8;hpb=39b00720d1fbe4762abb8bd5aab37572a31028f2;p=gacela.git

diff --git a/src/gacela_server.scm b/src/gacela_server.scm
index a95ec9d..f58c8b6 100644
--- a/src/gacela_server.scm
+++ b/src/gacela_server.scm
@@ -24,7 +24,7 @@
   (set! start-server
 	(lambda (port)
 	  (set! server-socket (socket PF_INET SOCK_STREAM 0))
-	  (fcntl server-socket F_SETFL (logior O_NONBLOCK (fcntl server-socket F_GETFL)))
+;	  (fcntl server-socket F_SETFL (logior O_NONBLOCK (fcntl server-socket F_GETFL)))
 	  (setsockopt server-socket SOL_SOCKET SO_REUSEADDR 1)
 	  (bind server-socket AF_INET INADDR_ANY port)
 	  (listen server-socket 5)))
@@ -32,7 +32,10 @@
   (set! check-connections
 	(lambda ()
 	  (catch #t
-		 (lambda () (set! clients (cons (accept server-socket) clients)))
+;		 (lambda () (set! clients (cons (accept server-socket) clients)))
+		 (lambda ()
+		   (cond ((char-ready? server-socket)
+			  (set! clients (cons (accept server-socket) clients)))))
 		 (lambda (key . args) #f))))
 
   (set! eval-from-clients
@@ -42,7 +45,7 @@
 	     (let ((sock (car cli)))
 	       (cond ((char-ready? sock)
 		      (catch #t
-			     (lambda () (eval (read sock)))
+			     (lambda () (display (primitive-eval (read sock)) sock))
 			     (lambda (key . args) #f))))))
 	   clients)))