0.pre7.92:

[sbcl.git] / src / code / fd-stream.lisp

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 2bf7810..aea8b57 100644 (file)
--- 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))
 
@@ -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))