From: jsancho <devnull@localhost>
Date: Fri, 13 Nov 2009 16:51:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=2fbfb3420ca25c0228e04b5696d42abce5e055ed;p=gacela.git

---

diff --git a/gacela.lisp b/gacela.lisp
index d94e468..8517a9c 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -215,7 +215,7 @@
   (defun eval-from-clients ()
     (dolist (cli clients)
       (when (si::listen cli)
-	(secure-block cli (eval (read cli))))))
+	(secure-block cli (eval (read-from-string (read-line cli)))))))
 
   (defun stop-server ()
     (when socket
diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index 7010b09..0785af7 100755
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -71,9 +71,10 @@
     `(block secure
        (defun si::universal-error-handler (error-name correctable function-name continue-format-string error-format-string &rest args)
 	 ,(when output-stream
-	    `(format ,output-stream
-		     (cond ((eq error-name :WRONG-TYPE-ARGUMENT) (string error-name))
-			   (t error-format-string))))
+	    `(write-line
+	      (cond ((eq error-name :WRONG-TYPE-ARGUMENT) (string error-name))
+		    (t error-format-string))
+	      ,output-stream))
 	 (setf (symbol-function 'si::universal-error-handler) ,error-handler)
 	 (return-from secure))
        (let (result-eval)