0.8alpha.0.9:
[sbcl.git] / src / code / run-program.lisp
index c4cc515..946f95e 100644 (file)
@@ -10,7 +10,7 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB-IMPL")
+(in-package "SB-IMPL") ;(SB-IMPL, not SB!IMPL, since we're built in warm load.)
 \f
 ;;;; hacking the Unix environment
 ;;;;
 ;;;; which (at least in sbcl-0.6.10 on Red Hat Linux 6.2) is not
 ;;;; visible at GENESIS time.
 
-(def-alien-variable "environ" (* c-string))
-
+(define-alien-routine wrapped-environ (* c-string))
 (defun posix-environ ()
   "Return the Unix environment (\"man environ\") as a list of SIMPLE-STRINGs."
-  (c-strings->string-list environ))
+  (c-strings->string-list (wrapped-environ)))
 
-;;; Convert as best we can from a SBCL representation of a Unix
+;;; Convert as best we can from an SBCL representation of a Unix
 ;;; environment to a CMU CL representation.
 ;;;
 ;;; * (UNIX-ENVIRONMENT-CMUCL-FROM-SBCL '("Bletch=fub" "Noggin" "YES=No!"))
 \f
 ;;;; Import wait3(2) from Unix.
 
-(sb-alien:def-alien-routine ("wait3" c-wait3) sb-c-call:int
-  (status sb-c-call:int :out)
-  (options sb-c-call:int)
-  (rusage sb-c-call:int))
-
-(defconstant wait-wnohang #-svr4 1 #+svr4 #o100)
-(defconstant wait-wuntraced #-svr4 2 #+svr4 4)
-(defconstant wait-wstopped #-svr4 #o177 #+svr4 wait-wuntraced)
+(define-alien-routine ("wait3" c-wait3) sb-alien:int
+  (status sb-alien:int :out)
+  (options sb-alien:int)
+  (rusage sb-alien:int))
 
 (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)))
 (defmethod print-object ((process process) stream)
   (print-unreadable-object (process stream :type t)
     (format stream
-           "~D ~S"
+           "~W ~S"
            (process-pid process)
            (process-status process)))
   process)
 #-hpux
 ;;; Find the current foreground process group id.
 (defun find-current-foreground-process (proc)
-  (sb-alien:with-alien ((result sb-c-call:int))
+  (with-alien ((result sb-alien:int))
     (multiple-value-bind
          (wonp error)
        (sb-unix:unix-ioctl (sb-sys:fd-stream-fd (process-pty proc))
                            sb-unix:TIOCGPGRP
-                           (sb-alien:alien-sap (sb-alien:addr result)))
+                           (alien-sap (sb-alien:addr result)))
       (unless wonp
        (error "TIOCPGRP ioctl failed: ~S" (strerror error)))
       result))
 ;;; list of handlers installed by RUN-PROGRAM
 (defvar *handlers-installed* nil)
 
-#+FreeBSD
-(def-alien-type nil
-  (struct sgttyb
-         (sg-ispeed sb-c-call:char)    ; input speed
-         (sg-ospeed sb-c-call:char)    ; output speed
-         (sg-erase sb-c-call:char)     ; erase character
-         (sg-kill sb-c-call:char)      ; kill character
-         (sg-flags sb-c-call:short)))  ; mode flags
-#+OpenBSD
-(def-alien-type nil
-  (struct sgttyb
-         (sg-four sb-c-call:int)
-         (sg-chars (array sb-c-call:char 4))
-         (sg-flags sb-c-call: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.
                                              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
       (when (streamp pty)
        (multiple-value-bind (new-fd errno) (sb-unix:unix-dup master)
          (unless new-fd
-           (error "couldn't SB-UNIX:UNIX-DUP ~D: ~A" master (strerror errno)))
+           (error "couldn't SB-UNIX:UNIX-DUP ~W: ~A" master (strerror errno)))
          (push new-fd *close-on-error*)
          (copy-descriptor-to-stream new-fd pty cookie)))
       (values name
          ;; Blast the string into place.
          (sb-kernel:copy-to-system-area (the simple-string s)
                                         (* sb-vm:vector-data-offset
-                                           sb-vm:word-bits)
+                                           sb-vm:n-word-bits)
                                         string-sap 0
-                                        (* (1+ n) sb-vm:byte-bits))
+                                        (* (1+ n) sb-vm:n-byte-bits))
          ;; Blast the pointer to the string into place.
          (setf (sap-ref-sap vec-sap i) string-sap)
          (setf string-sap (sap+ string-sap (round-bytes-to-words (1+ n))))
       (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)
             ,@body)
        (sb-sys:deallocate-system-memory ,sap ,size)))))
 
-(sb-alien:def-alien-routine spawn sb-c-call:int
-  (program sb-c-call:c-string)
-  (argv (* sb-c-call:c-string))
-  (envp (* sb-c-call:c-string))
-  (pty-name sb-c-call:c-string)
-  (stdin sb-c-call:int)
-  (stdout sb-c-call:int)
-  (stderr sb-c-call:int))
+(sb-alien:define-alien-routine spawn sb-alien:int
+  (program sb-alien:c-string)
+  (argv (* sb-alien:c-string))
+  (envp (* sb-alien:c-string))
+  (pty-name sb-alien:c-string)
+  (stdin sb-alien:int)
+  (stdout sb-alien:int)
+  (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)
               ;; "path:" defined in sbcl-0.6.10. It would probably be 
               ;; reasonable to restore Unix PATH searching in SBCL, e.g.
               ;; with a function FIND-EXECUTABLE-FILE-IN-POSIX-PATH.
-              ;; (I don't want to do it with search lists the way
-              ;; that CMU CL did, because those are a non-ANSI
-              ;; extension which I'd like to get rid of. -- WHN)
+              ;; CMU CL did it with a "PATH:" search list, but CMU CL
+              ;; search lists are a non-ANSI extension that SBCL
+              ;; doesn't support. -- WHN)
               (pfile (unix-namestring program t))
               (cookie (list 0)))
           (unless pfile
     (setf handler
          (sb-sys:add-fd-handler
           descriptor
-          :input #'(lambda (fd)
-                     (declare (ignore fd))
-                     (loop
-                         (unless handler
-                           (return))
-                         (multiple-value-bind
-                               (result readable/errno)
-                             (sb-unix:unix-select (1+ descriptor)
-                                                  (ash 1 descriptor)
-                                                  0 0 0)
-                           (cond ((null result)
-                                  (error "~@<couldn't select on sub-process: ~
+          :input (lambda (fd)
+                   (declare (ignore fd))
+                   (loop
+                    (unless handler
+                      (return))
+                    (multiple-value-bind
+                        (result readable/errno)
+                        (sb-unix:unix-select (1+ descriptor)
+                                             (ash 1 descriptor)
+                                             0 0 0)
+                      (cond ((null result)
+                             (error "~@<couldn't select on sub-process: ~
                                            ~2I~_~A~:>"
-                                         (strerror readable/errno)))
-                                 ((zerop result)
-                                  (return))))
-                       (sb-alien:with-alien ((buf (sb-alien:array
-                                                   sb-c-call:char
-                                                   256)))
-                         (multiple-value-bind
-                               (count errno)
-                             (sb-unix:unix-read descriptor
-                                                (alien-sap buf)
-                                                256)
-                           (cond ((or (and (null count)
-                                           (eql errno sb-unix:eio))
-                                      (eql count 0))
-                                  (sb-sys:remove-fd-handler handler)
-                                  (setf handler nil)
-                                  (decf (car cookie))
-                                  (sb-unix:unix-close descriptor)
-                                  (return))
-                                 ((null count)
-                                  (sb-sys:remove-fd-handler handler)
-                                  (setf handler nil)
-                                  (decf (car cookie))
-                                  (error
-                                   "~@<couldn't read input from sub-process: ~
+                                    (strerror readable/errno)))
+                            ((zerop result)
+                             (return))))
+                    (sb-alien:with-alien ((buf (sb-alien:array
+                                                sb-alien:char
+                                                256)))
+                      (multiple-value-bind
+                          (count errno)
+                          (sb-unix:unix-read descriptor
+                                             (alien-sap buf)
+                                             256)
+                        (cond ((or (and (null count)
+                                        (eql errno sb-unix:eio))
+                                   (eql count 0))
+                               (sb-sys:remove-fd-handler handler)
+                               (setf handler nil)
+                               (decf (car cookie))
+                               (sb-unix:unix-close descriptor)
+                               (return))
+                              ((null count)
+                               (sb-sys:remove-fd-handler handler)
+                               (setf handler nil)
+                               (decf (car cookie))
+                               (error
+                                "~@<couldn't read input from sub-process: ~
                                      ~2I~_~A~:>"
-                                   (strerror errno)))
-                                 (t
-                                  (sb-kernel:copy-from-system-area
-                                   (alien-sap buf) 0
-                                   string (* sb-vm:vector-data-offset
-                                             sb-vm:word-bits)
-                                   (* count sb-vm:byte-bits))
-                                  (write-string string stream
-                                                :end count)))))))))))
+                                (strerror errno)))
+                              (t
+                               (sb-kernel:copy-from-system-area
+                                (alien-sap buf) 0
+                                string (* sb-vm:vector-data-offset
+                                          sb-vm:n-word-bits)
+                                (* count sb-vm:n-byte-bits))
+                               (write-string string stream
+                                             :end count)))))))))))
 
 ;;; Find a file descriptor to use for object given the direction.
 ;;; Returns the descriptor. If object is :STREAM, returns the created