X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=f2dfe1075409dd8c9b0d0d675bd6d25c8de3404c;hb=11b388bac03fea3220e058eb93466bef7b66af75;hp=cc5a5956c4ecafaad3b9d7bb411b821420dcdf49;hpb=cb296ae5a022a5b0f1fd573584301b0d2a9493f9;p=sbcl.git

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index cc5a595..f2dfe10 100644
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -289,12 +289,12 @@
 (defun find-a-pty ()
   (dolist (char '(#\p #\q))
     (dotimes (digit 16)
-      (let* ((master-name (format nil "/dev/pty~C~X" char digit))
+      (let* ((master-name (coerce (format nil "/dev/pty~C~X" char digit) 'base-string))
 	     (master-fd (sb-unix:unix-open master-name
 					   sb-unix:o_rdwr
 					   #o666)))
 	(when master-fd
-	  (let* ((slave-name (format nil "/dev/tty~C~X" char digit))
+	  (let* ((slave-name (coerce (format nil "/dev/tty~C~X" char digit) 'base-string))
 		 (slave-fd (sb-unix:unix-open slave-name
 					      sb-unix:o_rdwr
 					      #o666)))
@@ -753,7 +753,16 @@
 			    (read-line object nil nil)
 			  (unless line
 			    (return))
-			  (sb-unix:unix-write fd line 0 (length line))
+			  (sb-unix:unix-write
+                           fd
+                           ;; FIXME: this really should be
+                           ;; (STRING-TO-OCTETS :EXTERNAL-FORMAT ...).
+                           ;; RUN-PROGRAM should take an
+                           ;; external-format argument, which should
+                           ;; be passed down to here.  Something
+                           ;; similar should happen on :OUTPUT, too.
+                           (map '(vector (unsigned-byte 8)) #'char-code line)
+                           0 (length line))
 			  (if no-cr
 			      (return)
 			      (sb-unix:unix-write fd newline 0 1)))))