X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=946f95e98cebaa5304b081b4e2ae5d39ee496ecc;hb=df679ed627975948b1cee190f4d79c397588c43e;hp=372fe263de93bbec0c7d6a3fc5ff5ed42e1ebb9f;hpb=0d669e68a1ffbea42af6216f2ae8c7d7ca12ffb6;p=sbcl.git

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index 372fe26..946f95e 100644
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -284,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.
@@ -315,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
@@ -405,8 +362,7 @@
       (values vec-sap (sap+ vec-sap #-alpha 4 #+alpha 8) total-bytes))))
 
 (defmacro with-c-strvec ((var str-list) &body body)
-  (let ((sap (gensym "SAP-"))
-	(size (gensym "SIZE-")))
+  (with-unique-names (sap size)
     `(multiple-value-bind
       (,sap ,var ,size)
       (string-list-to-c-strvec ,str-list)
@@ -425,6 +381,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)