X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffd-stream.lisp;h=105ee6fcafbc1357d435ede1a7fc76eb75318066;hb=b0b168c08b31a748150f404398af754f26fd4813;hp=2bf7810d42ff20c68969110e5bbc597004f4ce41;hpb=50305b602c3953440af716137a56f50cd204375d;p=sbcl.git

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 2bf7810..105ee6f 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -43,7 +43,7 @@
 
 (defstruct (fd-stream
 	    (:constructor %make-fd-stream)
-	    (:include lisp-stream
+	    (:include ansi-stream
 		      (misc #'fd-stream-misc-routine))
 	    (:copier nil))
 
@@ -154,9 +154,9 @@
 	 (setf (fd-stream-handler stream)
 	       (sb!sys:add-fd-handler (fd-stream-fd stream)
 				      :output
-				      #'(lambda (fd)
-					  (declare (ignore fd))
-					  (do-output-later stream)))))
+				      (lambda (fd)
+					(declare (ignore fd))
+					(do-output-later stream)))))
 	(t
 	 (nconc (fd-stream-output-later stream)
 		(list (list base start end reuse-sap)))))
@@ -203,38 +203,38 @@
   (declare (optimize (speed 1)))
   (cons 'progn
 	(mapcar
-	    #'(lambda (buffering)
-		(let ((function
-		       (intern (let ((*print-case* :upcase))
-				 (format nil name-fmt (car buffering))))))
-		  `(progn
-		     (defun ,function (stream byte)
-		       ,(unless (eq (car buffering) :none)
-			  `(when (< (fd-stream-obuf-length stream)
-				    (+ (fd-stream-obuf-tail stream)
-				       ,size))
-			     (flush-output-buffer stream)))
-		       ,@body
-		       (incf (fd-stream-obuf-tail stream) ,size)
-		       ,(ecase (car buffering)
-			  (:none
-			   `(flush-output-buffer stream))
-			  (:line
-			   `(when (eq (char-code byte) (char-code #\Newline))
-			      (flush-output-buffer stream)))
-			  (:full
-			   ))
-		       (values))
-		     (setf *output-routines*
-			   (nconc *output-routines*
-				  ',(mapcar
-					#'(lambda (type)
-					    (list type
-						  (car buffering)
-						  function
-						  size))
-				      (cdr buffering)))))))
-	  bufferings)))
+	    (lambda (buffering)
+	      (let ((function
+		     (intern (let ((*print-case* :upcase))
+			       (format nil name-fmt (car buffering))))))
+		`(progn
+		   (defun ,function (stream byte)
+		     ,(unless (eq (car buffering) :none)
+			`(when (< (fd-stream-obuf-length stream)
+				  (+ (fd-stream-obuf-tail stream)
+				     ,size))
+			   (flush-output-buffer stream)))
+		     ,@body
+		     (incf (fd-stream-obuf-tail stream) ,size)
+		     ,(ecase (car buffering)
+			(:none
+			 `(flush-output-buffer stream))
+			(:line
+			 `(when (eq (char-code byte) (char-code #\Newline))
+			    (flush-output-buffer stream)))
+			(:full
+			 ))
+		     (values))
+		   (setf *output-routines*
+			 (nconc *output-routines*
+				',(mapcar
+				   (lambda (type)
+				     (list type
+					   (car buffering)
+					   function
+					   size))
+				   (cdr buffering)))))))
+	    bufferings)))
 
 (def-output-routines ("OUTPUT-CHAR-~A-BUFFERED"
 		      1
@@ -479,6 +479,7 @@
 		 (simple-stream-perror "couldn't read from ~S" stream errno)))
 	    ((zerop count)
 	     (setf (fd-stream-listen stream) :eof)
+	     (/show0 "THROWing EOF-INPUT-CATCHER")
 	     (throw 'eof-input-catcher nil))
 	    (t
 	     (incf (fd-stream-ibuf-tail stream) count))))))
@@ -683,8 +684,8 @@
 	(when (eql size 1)
 	  (setf (fd-stream-n-bin fd-stream) #'fd-stream-read-n-bytes)
 	  (when buffer-p
-	    (setf (lisp-stream-in-buffer fd-stream)
-		  (make-array +in-buffer-length+
+	    (setf (ansi-stream-in-buffer fd-stream)
+		  (make-array +ansi-stream-in-buffer-length+
 			      :element-type '(unsigned-byte 8)))))
 	(setf input-size size)
 	(setf input-type type)))
@@ -984,7 +985,7 @@
 		       input-buffer-p
 		       (name (if file
 				 (format nil "file ~S" file)
-				 (format nil "descriptor ~D" fd)))
+				 (format nil "descriptor ~W" fd)))
 		       auto-close)
   (declare (type index fd) (type (or index null) timeout)
 	   (type (member :none :line :full) buffering))
@@ -1006,7 +1007,7 @@
 		(lambda ()
 		  (sb!unix:unix-close fd)
 		  #!+sb-show
-		  (format *terminal-io* "** closed file descriptor ~D **~%"
+		  (format *terminal-io* "** closed file descriptor ~W **~%"
 			  fd))))
     stream))