(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index d94e4685246edaa305112488eeca66ed7aa1cf29..8517a9c87c41a8d86189dab2e791dd2530123389 100644 (file)
--- 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 7010b0965f32bc23941e53181b89fa51d1d58c8a..0785af78cb07b8273216faf180fcd7ca1626584f 100755 (executable)
--- 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)