X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=9153a8f2cbe1193cfa17803991884a84edc7b4bd;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=fc02f3ef625dd86af36836b17a57319fa948a3c6;hpb=a0a198faba322eccaf947862b59946aed99b2347;p=sbcl.git

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index fc02f3e..9153a8f 100644
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -97,25 +97,21 @@
   (options sb-alien:int)
   (rusage sb-alien:int))
 
-(defconstant wait-wnohang #-svr4 1 #+svr4 #o100)
-(defconstant wait-wuntraced #-svr4 2 #+svr4 4)
-(defconstant wait-wstopped #-svr4 #o177 #+svr4 wait-wuntraced)
-
 (defun wait3 (&optional do-not-hang check-for-stopped)
   "Return any available status information on child process. "
   (multiple-value-bind (pid status)
       (c-wait3 (logior (if do-not-hang
-			   wait-wnohang
+			   sb-unix:wnohang
 			   0)
 		       (if check-for-stopped
-			   wait-wuntraced
+			   sb-unix:wuntraced
 			   0))
 	       0)
     (cond ((or (minusp pid)
 	       (zerop pid))
 	   nil)
 	  ((eql (ldb (byte 8 0) status)
-		wait-wstopped)
+		sb-unix:wstopped)
 	   (values pid
 		   :stopped
 		   (ldb (byte 8 8) status)))
@@ -288,21 +284,6 @@
 ;;; list of handlers installed by RUN-PROGRAM
 (defvar *handlers-installed* nil)
 
-#+FreeBSD
-(define-alien-type nil
-  (struct sgttyb
-	  (sg-ispeed sb-alien:char)	; input speed
-	  (sg-ospeed sb-alien:char)	; output speed
-	  (sg-erase sb-alien:char)	; erase character
-	  (sg-kill sb-alien:char)	; kill character
-	  (sg-flags sb-alien:short)))	; mode flags
-#+OpenBSD
-(define-alien-type nil
-  (struct sgttyb
-	  (sg-four sb-alien:int)
-	  (sg-chars (array sb-alien:char 4))
-	  (sg-flags sb-alien:int)))
-
 ;;; Find an unused pty. Return three values: the file descriptor for
 ;;; the master side of the pty, the file descriptor for the slave side
 ;;; of the pty, and the name of the tty device for the slave side.
@@ -319,34 +300,6 @@
 					      sb-unix:o_rdwr
 					      #o666)))
 	    (when slave-fd
-	      ;; comment from classic CMU CL:
-	      ;;   Maybe put a vhangup here?
-	      ;;
-	      ;; FIXME: It seems as though this logic should be in
-	      ;; OPEN-PTY, not FIND-A-PTY (both from the comments
-	      ;; documenting DEFUN FIND-A-PTY, and from the
-	      ;; connotations of the function names).
-	      ;;
-	      ;; FIXME: It would be nice to have a note, and/or a pointer
-	      ;; to some reference material somewhere, explaining
-	      ;; why we need this on *BSD and not on Linux.
-              #+bsd
-	      (sb-alien:with-alien ((stuff (sb-alien:struct sgttyb)))
-		(let ((sap (sb-alien:alien-sap stuff)))
-		  (sb-unix:unix-ioctl slave-fd sb-unix:TIOCGETP sap)
-		  (setf (sb-alien:slot stuff 'sg-flags)
-			;; This is EVENP|ODDP, the same numeric code
-			;; both on FreeBSD and on OpenBSD. -- WHN 20000929
-			#o300) ; EVENP|ODDP
-		  (sb-unix:unix-ioctl slave-fd sb-unix:TIOCSETP sap)
-		  (sb-unix:unix-ioctl master-fd sb-unix:TIOCGETP sap)
-		  (setf (sb-alien:slot stuff 'sg-flags)
-			(logand (sb-alien:slot stuff 'sg-flags)
-				;; This is ~ECHO, the same numeric
-				;; code both on FreeBSD and on OpenBSD.
-				;; -- WHN 20000929
-				(lognot 8))) ; ~ECHO
-		  (sb-unix:unix-ioctl master-fd sb-unix:TIOCSETP sap)))
 	      (return-from find-a-pty
 		(values master-fd
 			slave-fd
@@ -429,6 +382,7 @@
   (stderr sb-alien:int))
 
 ;;; Is UNIX-FILENAME the name of a file that we can execute?
+;;; XXX does this actually work for symlinks?
 (defun unix-filename-is-executable-p (unix-filename)
   (declare (type simple-string unix-filename))
   (values (and (eq (sb-unix:unix-file-kind unix-filename) :file)