1.0.33.11: thread-safe FIND-PACKAGE & DEFPACKAGE

[sbcl.git] / contrib / sb-simple-streams / impl.lisp

diff --git a/contrib/sb-simple-streams/impl.lisp b/contrib/sb-simple-streams/impl.lisp
index c6b696c..014c852 100644 (file)
--- a/contrib/sb-simple-streams/impl.lisp
+++ b/contrib/sb-simple-streams/impl.lisp
@@ -126,7 +126,7 @@
   (if (typep stream 'file-simple-stream)
       (with-stream-class (file-simple-stream stream)
         (setf (sm pathname stream) new-name)
-        (setf (sm filename stream) (sb-int:unix-namestring new-name nil))
+        (setf (sm filename stream) (file-namestring new-name))
         t)
       nil))
 
@@ -293,12 +293,11 @@
         (funcall-stm-handler j-listen (sm melded-stream stream))
         (or (< (sm buffpos stream) (sm buffer-ptr stream))
             ;; Attempt buffer refill
-            (let ((lcrs (sm last-char-read-size stream)))
-              (when (and (not (any-stream-instance-flags stream :dual :string))
-                         (>= (sm mode stream) 0))
-                ;; single-channel stream dirty -> write data before reading
-                (flush-buffer stream nil))
-              (>= (refill-buffer stream nil) width))))))
+            (when (and (not (any-stream-instance-flags stream :dual :string))
+                       (>= (sm mode stream) 0))
+              ;; single-channel stream dirty -> write data before reading
+              (flush-buffer stream nil))
+            (>= (refill-buffer stream nil) width)))))
 
 (defun %clear-input (stream buffer-only)
   (declare (type simple-stream stream))
@@ -750,7 +749,6 @@
 (defun read-char-no-hang (&optional (stream *standard-input*) (eof-error-p t)
                                     eof-value recursive-p)
   "Returns the next character from the Stream if one is availible, or nil."
-  (declare (ignore recursive-p))
   (let ((stream (sb-impl::in-synonym-of stream)))
     (etypecase stream
       (simple-stream
@@ -1099,7 +1097,7 @@ is supported only on simple-streams."
      (cond (new-name
             (setf (sb-impl::fd-stream-pathname stream) new-name)
             (setf (sb-impl::fd-stream-file stream)
-                  (sb-int:unix-namestring new-name nil))
+                  (file-namestring new-name))
             t)
            (t
             (sb-impl::fd-stream-pathname stream))))))