X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffd-stream.lisp;h=ae79940b85c155036593b619a71d14a2ffcddb2a;hb=df679ed627975948b1cee190f4d79c397588c43e;hp=824636eb54507087b1c38f848985965a2ab93adf;hpb=de713b5470a9a192d3d33a492f37ca7335129eee;p=sbcl.git

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 824636e..ae79940 100644
--- 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.
@@ -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*)