0.8.0.3:

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

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 824636e..26ebeb7 100644 (file)
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -457,10 +457,8 @@
       (case count
        (1)
        (0
-        (unless #!-mp (sb!sys:wait-until-fd-usable
-                      fd :input (fd-stream-timeout stream))
-                #!+mp (sb!mp:process-wait-until-fd-usable
-                      fd :input (fd-stream-timeout stream))
+        (unless (sb!sys:wait-until-fd-usable
+                 fd :input (fd-stream-timeout stream))
           (error 'io-timeout :stream stream :direction :read)))
        (t
         (simple-stream-perror "couldn't check whether ~S is readable"
@@ -473,10 +471,8 @@
       (cond ((null count)
             (if (eql errno sb!unix:ewouldblock)
                 (progn
-                  (unless #!-mp (sb!sys:wait-until-fd-usable
-                                fd :input (fd-stream-timeout stream))
-                          #!+mp (sb!mp:process-wait-until-fd-usable
-                                fd :input (fd-stream-timeout stream))
+                  (unless (sb!sys:wait-until-fd-usable
+                           fd :input (fd-stream-timeout stream))
                     (error 'io-timeout :stream stream :direction :read))
                   (frob-input stream))
                 (simple-stream-perror "couldn't read from ~S" stream errno)))
@@ -852,7 +848,8 @@
      (fd-stream-element-type fd-stream))
     (:interactive-p
       ;; FIXME: sb!unix:unix-isatty is undefined.
-     (sb!unix:unix-isatty (fd-stream-fd fd-stream)))
+     (= 1 (the (member 0 1)
+            (sb!unix:unix-isatty (fd-stream-fd fd-stream)))))
     (:line-length
      80)
     (:charpos
@@ -1017,8 +1014,8 @@
 ;;; Pick a name to use for the backup file for the :IF-EXISTS
 ;;; :RENAME-AND-DELETE and :RENAME options.
 (defun pick-backup-name (name)
-  (declare (type simple-string name))
-  (concatenate 'simple-string name ".bak"))
+  (declare (type simple-base-string name))
+  (concatenate 'simple-base-string name ".bak"))
 
 ;;; Ensure that the given arg is one of the given list of valid
 ;;; things. Allow the user to fix any problems.
@@ -1063,7 +1060,7 @@
    :ELEMENT-TYPE - the type of object to read or write, default BASE-CHAR
    :IF-EXISTS - one of :ERROR, :NEW-VERSION, :RENAME, :RENAME-AND-DELETE,
                       :OVERWRITE, :APPEND, :SUPERSEDE or NIL
-   :IF-DOES-NOT-EXIST - one of :ERROR, :CREATE or nil
+   :IF-DOES-NOT-EXIST - one of :ERROR, :CREATE or NIL
   See the manual for details."
 
   (unless (eq external-format :default)
@@ -1238,14 +1235,7 @@
   (stream-reinit)
   (setf *terminal-io* (make-synonym-stream '*tty*))
   (setf *standard-output* (make-synonym-stream '*stdout*))
-  (setf *standard-input*
-       (#!-high-security
-        ;; FIXME: Why is *STANDARD-INPUT* a TWO-WAY-STREAM? ANSI says
-        ;; it's an input stream.
-        make-two-way-stream
-        #!+high-security
-        %make-two-way-stream (make-synonym-stream '*stdin*)
-                            *standard-output*))
+  (setf *standard-input* (make-synonym-stream '*stdin*))
   (setf *error-output* (make-synonym-stream '*stderr*))
   (setf *query-io* (make-synonym-stream '*terminal-io*))
   (setf *debug-io* *query-io*)