Simplify (and robustify) regular PACKing

[sbcl.git] / src / code / run-program.lisp

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index 3c6cf2b..eb9aa47 100644 (file)
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -52,37 +52,46 @@
     "Return the Unix environment (\"man environ\") as a list of SIMPLE-STRINGs."
     (c-strings->string-list (wrapped-environ))))
 
     "Return the Unix environment (\"man environ\") as a list of SIMPLE-STRINGs."
     (c-strings->string-list (wrapped-environ))))
 

-;#+win32 (sb-alien:define-alien-routine msvcrt-environ (* c-string))
+#+win32
+(progn
+  (defun decode-windows-environment (environment)
+    (loop until (zerop (sap-ref-8 environment 0))
+          collect
+          (let ((string (sb-alien::c-string-to-string environment
+                                                      (sb-alien::default-c-string-external-format)
+                                                      'character)))
+            (loop for value = (sap-ref-8 environment 0)
+                  do (setf environment (sap+ environment 1))
+                  until (zerop value))
+            string)))

 
 

-;;; 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!"))
-;;; WARNING:
-;;;   smashing case of "Bletch=fub" in conversion to CMU-CL-style
-;;;     environment alist
-;;; WARNING:
-;;;   no #\= in "Noggin", eliding it in CMU-CL-style environment alist
-;;; ((:BLETCH . "fub") (:YES . "No!"))
-(defun unix-environment-cmucl-from-sbcl (sbcl)
-  (mapcan
-   (lambda (string)
-     (declare (string string))
-     (let ((=-pos (position #\= string :test #'equal)))
-       (if =-pos
-           (list
-            (let* ((key-as-string (subseq string 0 =-pos))
-                   (key-as-upcase-string (string-upcase key-as-string))
-                   (key (keywordicate key-as-upcase-string))
-                   (val (subseq string (1+ =-pos))))
-              (unless (string= key-as-string key-as-upcase-string)
-                (warn "smashing case of ~S in conversion to CMU-CL-style ~
-                      environment alist"
-                      string))
-              (cons key val)))
-           (warn "no #\\= in ~S, eliding it in CMU-CL-style environment alist"
-                 string))))
-   sbcl))
+  (defun encode-windows-environment (list)
+    (let* ((external-format (sb-alien::default-c-string-external-format))
+           octets
+           (length 1)) ;; 1 for \0 at the very end
+      (setf octets
+            (loop for x in list
+                  for octet =
+                  (string-to-octets x :external-format external-format
+                                      :null-terminate t)
+                  collect octet
+                  do
+                  (incf length (length octet))))
+      (let ((mem (allocate-system-memory length))
+            (index 0))
+
+        (loop for string in octets
+              for length = (length string)
+              do
+              (copy-ub8-to-system-area string 0 mem index length)
+              (incf index length))
+        (setf (sap-ref-8 mem index) 0)
+        (values mem mem length))))
+
+  (defun posix-environ ()
+    (decode-windows-environment
+     (alien-funcall (extern-alien "GetEnvironmentStrings"
+                                  (function system-area-pointer))))))

 
 ;;; Convert from a CMU CL representation of a Unix environment to a
 ;;; SBCL representation.
 
 ;;; Convert from a CMU CL representation of a Unix environment to a
 ;;; SBCL representation.

@@ -97,23 +106,23 @@
 ;;;; Import wait3(2) from Unix.
 
 #-win32
 ;;;; Import wait3(2) from Unix.
 
 #-win32

-(define-alien-routine ("wait3" c-wait3) sb-alien:int
-  (status sb-alien:int :out)
-  (options sb-alien:int)
-  (rusage sb-alien:int))
+(define-alien-routine ("waitpid" c-waitpid) int
+  (pid int)
+  (status int :out)
+  (options int))

 
 #-win32
 
 #-win32

-(defun wait3 (&optional do-not-hang check-for-stopped)
+(defun waitpid (pid &optional do-not-hang check-for-stopped)

   #+sb-doc
   #+sb-doc

-  "Return any available status information on child process. "
+  "Return any available status information on child process with PID."

   (multiple-value-bind (pid status)
   (multiple-value-bind (pid status)

-      (c-wait3 (logior (if do-not-hang
-                           sb-unix:wnohang
-                           0)
-                       (if check-for-stopped
-                           sb-unix:wuntraced
-                           0))
-               0)
+      (c-waitpid pid
+                 (logior (if do-not-hang
+                             sb-unix:wnohang
+                             0)
+                         (if check-for-stopped
+                             sb-unix:wuntraced
+                             0)))

     (cond ((or (minusp pid)
                (zerop pid))
            nil)
     (cond ((or (minusp pid)
                (zerop pid))
            nil)

@@ -145,7 +154,6 @@
   #+sb-doc
   "List of process structures for all active processes.")
 
   #+sb-doc
   "List of process structures for all active processes.")
 

-#-win32

 (defvar *active-processes-lock*
   (sb-thread:make-mutex :name "Lock for active processes."))
 
 (defvar *active-processes-lock*
   (sb-thread:make-mutex :name "Lock for active processes."))
 

@@ -153,15 +161,13 @@
 ;;; mutex is needed. More importantly the sigchld signal handler also
 ;;; accesses it, that's why we need without-interrupts.
 (defmacro with-active-processes-lock (() &body body)
 ;;; mutex is needed. More importantly the sigchld signal handler also
 ;;; accesses it, that's why we need without-interrupts.
 (defmacro with-active-processes-lock (() &body body)

-  #-win32
-  `(sb-thread::call-with-system-mutex (lambda () ,@body) *active-processes-lock*)
-  #+win32
-  `(progn ,@body))
+  `(sb-thread::with-system-mutex (*active-processes-lock*)
+     ,@body))

 
 (defstruct (process (:copier nil))
   pid                 ; PID of child process
   %status             ; either :RUNNING, :STOPPED, :EXITED, or :SIGNALED
 
 (defstruct (process (:copier nil))
   pid                 ; PID of child process
   %status             ; either :RUNNING, :STOPPED, :EXITED, or :SIGNALED

-  exit-code           ; either exit code or signal
+  %exit-code          ; either exit code or signal

   core-dumped         ; T if a core image was dumped
   #-win32 pty                 ; stream to child's pty, or NIL
   input               ; stream to child's input, or NIL
   core-dumped         ; T if a core image was dumped
   #-win32 pty                 ; stream to child's pty, or NIL
   input               ; stream to child's input, or NIL

@@ -175,7 +181,7 @@
   (print-unreadable-object (process stream :type t)
     (let ((status (process-status process)))
      (if (eq :exited status)
   (print-unreadable-object (process stream :type t)
     (let ((status (process-status process)))
      (if (eq :exited status)

-         (format stream "~S ~S" status (process-exit-code process))
+         (format stream "~S ~S" status (process-%exit-code process))

          (format stream "~S ~S" (process-pid process) status)))
     process))
 
          (format stream "~S ~S" (process-pid process) status)))
     process))
 

@@ -187,10 +193,17 @@
 (setf (documentation 'process-pid 'function) "The pid of the child process.")
 
 #+win32
 (setf (documentation 'process-pid 'function) "The pid of the child process.")
 
 #+win32

-(define-alien-routine ("GetExitCodeProcess@8" get-exit-code-process)
+(define-alien-routine ("GetExitCodeProcess" get-exit-code-process)

     int
   (handle unsigned) (exit-code unsigned :out))
 
     int
   (handle unsigned) (exit-code unsigned :out))
 

+(defun process-exit-code (process)
+  #+sb-doc
+  "Return the exit code of PROCESS."
+  (or (process-%exit-code process)
+      (progn (get-processes-status-changes)
+             (process-%exit-code process))))
+

 (defun process-status (process)
   #+sb-doc
   "Return the current status of PROCESS.  The result is one of :RUNNING,
 (defun process-status (process)
   #+sb-doc
   "Return the current status of PROCESS.  The result is one of :RUNNING,

@@ -236,6 +249,16 @@ The function is called with PROCESS as its only argument.")
   "Wait for PROCESS to quit running for some reason. When
 CHECK-FOR-STOPPED is T, also returns when PROCESS is stopped. Returns
 PROCESS."
   "Wait for PROCESS to quit running for some reason. When
 CHECK-FOR-STOPPED is T, also returns when PROCESS is stopped. Returns
 PROCESS."

+  (declare (ignorable check-for-stopped))
+  #+win32
+  (let ((pid (process-pid process)))
+    (when (and pid (plusp pid))
+      (without-interrupts
+        (do ()
+            ((= 0
+                (with-local-interrupts
+                  (sb-win32:wait-object-or-signal pid))))))))
+  #-win32

   (loop
       (case (process-status process)
         (:running)
   (loop
       (case (process-status process)
         (:running)

@@ -245,18 +268,18 @@ PROCESS."
         (t
          (when (zerop (car (process-cookie process)))
            (return))))
         (t
          (when (zerop (car (process-cookie process)))
            (return))))

-      (sb-sys:serve-all-events 1))
+      (serve-all-events 1))

   process)
 
   process)
 

-#-(or hpux win32)
+#-win32

 ;;; Find the current foreground process group id.
 (defun find-current-foreground-process (proc)
 ;;; Find the current foreground process group id.
 (defun find-current-foreground-process (proc)

-  (with-alien ((result sb-alien:int))
+  (with-alien ((result int))

     (multiple-value-bind
           (wonp error)
     (multiple-value-bind
           (wonp error)

-        (sb-unix:unix-ioctl (sb-sys:fd-stream-fd (process-pty proc))
+        (sb-unix:unix-ioctl (fd-stream-fd (process-pty proc))

                             sb-unix:TIOCGPGRP
                             sb-unix:TIOCGPGRP

-                            (alien-sap (sb-alien:addr result)))
+                            (alien-sap (addr result)))

       (unless wonp
         (error "TIOCPGRP ioctl failed: ~S" (strerror error)))
       result))
       (unless wonp
         (error "TIOCPGRP ioctl failed: ~S" (strerror error)))
       result))

@@ -273,18 +296,11 @@ PROCESS."
                ((:pid :process-group)
                 (process-pid process))
                (:pty-process-group
                ((:pid :process-group)
                 (process-pid process))
                (:pty-process-group

-                #-hpux

                 (find-current-foreground-process process)))))
     (multiple-value-bind
           (okay errno)
         (case whom
                 (find-current-foreground-process process)))))
     (multiple-value-bind
           (okay errno)
         (case whom

-          #+hpux
-          (:pty-process-group
-           (sb-unix:unix-ioctl (sb-sys:fd-stream-fd (process-pty process))
-                               sb-unix:TIOCSIGSEND
-                               (sb-sys:int-sap
-                                signal)))
-          ((:process-group #-hpux :pty-process-group)
+          ((:process-group)

            (sb-unix:unix-killpg pid signal))
           (t
            (sb-unix:unix-kill pid signal)))
            (sb-unix:unix-killpg pid signal))
           (t
            (sb-unix:unix-kill pid signal)))

@@ -293,7 +309,7 @@ PROCESS."
             ((and (eql pid (process-pid process))
                   (= signal sb-unix:sigcont))
              (setf (process-%status process) :running)
             ((and (eql pid (process-pid process))
                   (= signal sb-unix:sigcont))
              (setf (process-%status process) :running)

-             (setf (process-exit-code process) nil)
+             (setf (process-%exit-code process) nil)

              (when (process-status-hook process)
                (funcall (process-status-hook process) process))
              t)
              (when (process-status-hook process)
                (funcall (process-status-hook process) process))
              t)

@@ -324,51 +340,50 @@ status slot."
   ;; maybe it should be set to :CLOSED, or similar?
   (with-active-processes-lock ()
    (setf *active-processes* (delete process *active-processes*)))
   ;; maybe it should be set to :CLOSED, or similar?
   (with-active-processes-lock ()
    (setf *active-processes* (delete process *active-processes*)))

+  #+win32
+  (let ((handle (shiftf (process-pid process) nil)))
+    (when (and handle (plusp handle))
+      (or (sb-win32:close-handle handle)
+          (sb-win32::win32-error 'process-close))))

   process)
 
   process)
 

-;;; the handler for SIGCHLD signals that RUN-PROGRAM establishes
-#-win32
-(defun sigchld-handler (ignore1 ignore2 ignore3)
-  (declare (ignore ignore1 ignore2 ignore3))
-  (get-processes-status-changes))
-

 (defun get-processes-status-changes ()
 (defun get-processes-status-changes ()

-  #-win32
-  (loop
-   (multiple-value-bind (pid what code core)
-       (wait3 t t)
-     (unless pid
-       (return))
-     (let ((proc (with-active-processes-lock ()
-                   (find pid *active-processes* :key #'process-pid))))
-       (when proc
-         (setf (process-%status proc) what)
-         (setf (process-exit-code proc) code)
-         (setf (process-core-dumped proc) core)
-         (when (process-status-hook proc)
-           (funcall (process-status-hook proc) proc))
-         (when (position what #(:exited :signaled))
-           (with-active-processes-lock ()
-             (setf *active-processes*
-                   (delete proc *active-processes*))))))))
-  #+win32

   (let (exited)
     (with-active-processes-lock ()
       (setf *active-processes*
   (let (exited)
     (with-active-processes-lock ()
       (setf *active-processes*

-            (delete-if (lambda (proc)
-                         (multiple-value-bind (ok code)
-                             (get-exit-code-process (process-pid proc))
-                           (when (and (plusp ok) (/= code 259))
-                             (setf (process-%status proc) :exited
-                                   (process-exit-code proc) code)
+            (delete-if #-win32
+                       (lambda (proc)
+                         ;; Wait only on pids belonging to processes
+                         ;; started by RUN-PROGRAM. There used to be a
+                         ;; WAIT3 call here, but that makes direct
+                         ;; WAIT, WAITPID usage impossible due to the
+                         ;; race with the SIGCHLD signal handler.
+                         (multiple-value-bind (pid what code core)
+                             (waitpid (process-pid proc) t t)
+                           (when pid
+                             (setf (process-%status proc) what)
+                             (setf (process-%exit-code proc) code)
+                             (setf (process-core-dumped proc) core)

                              (when (process-status-hook proc)
                                (push proc exited))
                              t)))
                              (when (process-status-hook proc)
                                (push proc exited))
                              t)))

+                       #+win32
+                       (lambda (proc)
+                         (let ((pid (process-pid proc)))
+                           (when pid
+                             (multiple-value-bind (ok code)
+                                 (sb-win32::get-exit-code-process pid)
+                               (when (and (plusp ok) (/= code 259))
+                                 (setf (process-%status proc) :exited
+                                       (process-%exit-code proc) code)
+                                 (when (process-status-hook proc)
+                                   (push proc exited))
+                                 t)))))

                        *active-processes*)))
     ;; Can't call the hooks before all the processes have been deal
     ;; with, as calling a hook may cause re-entry to
                        *active-processes*)))
     ;; Can't call the hooks before all the processes have been deal
     ;; with, as calling a hook may cause re-entry to

-    ;; GET-PROCESS-STATUS-CHANGES. That may be OK when using wait3,
-    ;; but in the Windows implementation is would be deeply bad.
+    ;; GET-PROCESS-STATUS-CHANGES. That may be OK when using waitpid,
+    ;; but in the Windows implementation it would be deeply bad.

     (dolist (proc exited)
       (let ((hook (process-status-hook proc)))
         (when hook
     (dolist (proc exited)
       (let ((hook (process-status-hook proc)))
         (when hook

@@ -382,14 +397,15 @@ status slot."
 ;;; list of file descriptors to close when RUN-PROGRAM returns in the parent
 (defvar *close-in-parent* nil)
 
 ;;; list of file descriptors to close when RUN-PROGRAM returns in the parent
 (defvar *close-in-parent* nil)
 

-;;; list of handlers installed by RUN-PROGRAM
+;;; list of handlers installed by RUN-PROGRAM.  FIXME: nothing seems
+;;; to set this.

 #-win32
 (defvar *handlers-installed* nil)
 
 ;;; 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.
 #-win32
 (defvar *handlers-installed* nil)
 
 ;;; 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.

-#-win32
+#-(or win32 openbsd)

 (progn
   (define-alien-routine ptsname c-string (fd int))
   (define-alien-routine grantpt boolean (fd int))
 (progn
   (define-alien-routine ptsname c-string (fd int))
   (define-alien-routine grantpt boolean (fd int))

@@ -399,14 +415,16 @@ status slot."
     ;; First try to use the Unix98 pty api.
     (let* ((master-name (coerce (format nil "/dev/ptmx") 'base-string))
            (master-fd (sb-unix:unix-open master-name
     ;; First try to use the Unix98 pty api.
     (let* ((master-name (coerce (format nil "/dev/ptmx") 'base-string))
            (master-fd (sb-unix:unix-open master-name

-                                         sb-unix:o_rdwr
+                                         (logior sb-unix:o_rdwr
+                                                 sb-unix:o_noctty)

                                          #o666)))
       (when master-fd
         (grantpt master-fd)
         (unlockpt master-fd)
         (let* ((slave-name (ptsname master-fd))
                (slave-fd (sb-unix:unix-open slave-name
                                          #o666)))
       (when master-fd
         (grantpt master-fd)
         (unlockpt master-fd)
         (let* ((slave-name (ptsname master-fd))
                (slave-fd (sb-unix:unix-open slave-name

-                                            sb-unix:o_rdwr
+                                            (logior sb-unix:o_rdwr
+                                                    sb-unix:o_noctty)

                                             #o666)))
           (when slave-fd
             (return-from find-a-pty
                                             #o666)))
           (when slave-fd
             (return-from find-a-pty

@@ -421,13 +439,15 @@ status slot."
         (let* ((master-name (coerce (format nil "/dev/pty~C~X" char digit)
                                     'base-string))
                (master-fd (sb-unix:unix-open master-name
         (let* ((master-name (coerce (format nil "/dev/pty~C~X" char digit)
                                     'base-string))
                (master-fd (sb-unix:unix-open master-name

-                                             sb-unix:o_rdwr
+                                             (logior sb-unix:o_rdwr
+                                                     sb-unix:o_noctty)

                                              #o666)))
           (when master-fd
             (let* ((slave-name (coerce (format nil "/dev/tty~C~X" char digit)
                                        'base-string))
                    (slave-fd (sb-unix:unix-open slave-name
                                              #o666)))
           (when master-fd
             (let* ((slave-name (coerce (format nil "/dev/tty~C~X" char digit)
                                        'base-string))
                    (slave-fd (sb-unix:unix-open slave-name

-                                                sb-unix:o_rdwr
+                                                (logior sb-unix:o_rdwr
+                                                        sb-unix:o_noctty)

                                                 #o666)))
               (when slave-fd
                 (return-from find-a-pty
                                                 #o666)))
               (when slave-fd
                 (return-from find-a-pty

@@ -436,9 +456,24 @@ status slot."
                           slave-name)))
               (sb-unix:unix-close master-fd))))))
     (error "could not find a pty")))
                           slave-name)))
               (sb-unix:unix-close master-fd))))))
     (error "could not find a pty")))

+#+openbsd
+(progn
+  (define-alien-routine openpty int (amaster int :out) (aslave int :out)
+                        (name (* char)) (termp (* t)) (winp (* t)))
+  (defun find-a-pty ()
+    (with-alien ((name-buf (array char 16)))
+      (multiple-value-bind (return-val master-fd slave-fd)
+          (openpty (cast name-buf (* char)) nil nil)
+        (if (zerop return-val)
+            (values master-fd
+                    slave-fd
+                    (sb-alien::c-string-to-string (alien-sap name-buf)
+                                                  (sb-impl::default-external-format)
+                                                  'character))
+            (error "could not find a pty"))))))

 
 #-win32
 
 #-win32

-(defun open-pty (pty cookie)
+(defun open-pty (pty cookie &key (external-format :default))

   (when pty
     (multiple-value-bind
           (master slave name)
   (when pty
     (multiple-value-bind
           (master slave name)

@@ -450,104 +485,149 @@ status slot."
           (unless new-fd
             (error "couldn't SB-UNIX:UNIX-DUP ~W: ~A" master (strerror errno)))
           (push new-fd *close-on-error*)
           (unless new-fd
             (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)))
+          (copy-descriptor-to-stream new-fd pty cookie external-format)))

       (values name
       (values name

-              (sb-sys:make-fd-stream master :input t :output t
+              (make-fd-stream master :input t :output t
+                                     :external-format external-format

                                      :element-type :default
                                      :dual-channel-p t)))))
 
                                      :element-type :default
                                      :dual-channel-p t)))))
 

-(defmacro round-bytes-to-words (n)
-  (let ((bytes-per-word (/ sb-vm:n-machine-word-bits sb-vm:n-byte-bits)))
-    `(logandc2 (the fixnum (+ (the fixnum ,n)
-                              (1- ,bytes-per-word))) (1- ,bytes-per-word))))
+;; Null terminate strings only C-side: otherwise we can run into
+;; A-T-S-L even for simple encodings like ASCII.  Multibyte encodings
+;; may need more than a single byte of zeros; assume 4 byte is enough
+;; for everyone.
+#-win32
+(defmacro round-null-terminated-bytes-to-words (n)
+  `(logandc2 (the sb-vm:signed-word (+ (the fixnum ,n)
+                                       4 (1- sb-vm:n-word-bytes)))
+             (1- sb-vm:n-word-bytes)))

 
 

+#-win32

 (defun string-list-to-c-strvec (string-list)
 (defun string-list-to-c-strvec (string-list)

-  (let* ((bytes-per-word (/ sb-vm:n-machine-word-bits sb-vm:n-byte-bits))
-         ;; We need an extra for the null, and an extra 'cause exect
+  (let* (;; We need an extra for the null, and an extra 'cause exect

          ;; clobbers argv[-1].
          ;; clobbers argv[-1].

-         (vec-bytes (* bytes-per-word (+ (length string-list) 2)))
+         (vec-bytes (* sb-vm:n-word-bytes (+ (length string-list) 2)))

          (octet-vector-list (mapcar (lambda (s)
          (octet-vector-list (mapcar (lambda (s)

-                                      (string-to-octets s :null-terminate t))
+                                      (string-to-octets s))

                                     string-list))
          (string-bytes (reduce #'+ octet-vector-list
                                :key (lambda (s)
                                     string-list))
          (string-bytes (reduce #'+ octet-vector-list
                                :key (lambda (s)

-                                      (round-bytes-to-words (length s)))))
+                                      (round-null-terminated-bytes-to-words
+                                       (length s)))))

          (total-bytes (+ string-bytes vec-bytes))
          ;; Memory to hold the vector of pointers and all the strings.
          (total-bytes (+ string-bytes vec-bytes))
          ;; Memory to hold the vector of pointers and all the strings.

-         (vec-sap (sb-sys:allocate-system-memory total-bytes))
+         (vec-sap (allocate-system-memory total-bytes))

          (string-sap (sap+ vec-sap vec-bytes))
          ;; Index starts from [1]!
          (string-sap (sap+ vec-sap vec-bytes))
          ;; Index starts from [1]!

-         (vec-index-offset bytes-per-word))
-    (declare (index string-bytes vec-bytes total-bytes)
-             (sb-sys:system-area-pointer vec-sap string-sap))
+         (vec-index-offset sb-vm:n-word-bytes))
+    (declare (sb-vm:signed-word vec-bytes)
+             (sb-vm:word string-bytes total-bytes)
+             (system-area-pointer vec-sap string-sap))

     (dolist (octets octet-vector-list)
       (declare (type (simple-array (unsigned-byte 8) (*)) octets))
       (let ((size (length octets)))
         ;; Copy string.
         (sb-kernel:copy-ub8-to-system-area octets 0 string-sap 0 size)
     (dolist (octets octet-vector-list)
       (declare (type (simple-array (unsigned-byte 8) (*)) octets))
       (let ((size (length octets)))
         ;; Copy string.
         (sb-kernel:copy-ub8-to-system-area octets 0 string-sap 0 size)

+        ;; NULL-terminate it
+        (sb-kernel:system-area-ub8-fill 0 string-sap size 4)

         ;; Put the pointer in the vector.
         (setf (sap-ref-sap vec-sap vec-index-offset) string-sap)
         ;; Advance string-sap for the next string.
         ;; Put the pointer in the vector.
         (setf (sap-ref-sap vec-sap vec-index-offset) string-sap)
         ;; Advance string-sap for the next string.

-        (setf string-sap (sap+ string-sap (round-bytes-to-words (1+ size))))
-        (incf vec-index-offset bytes-per-word)))
+        (setf string-sap (sap+ string-sap
+                               (round-null-terminated-bytes-to-words size)))
+        (incf vec-index-offset sb-vm:n-word-bytes)))

     ;; Final null pointer.
     (setf (sap-ref-sap vec-sap vec-index-offset) (int-sap 0))
     ;; Final null pointer.
     (setf (sap-ref-sap vec-sap vec-index-offset) (int-sap 0))

-    (values vec-sap (sap+ vec-sap bytes-per-word) total-bytes)))
+    (values vec-sap (sap+ vec-sap sb-vm:n-word-bytes) total-bytes)))

 
 

-(defmacro with-c-strvec ((var str-list) &body body)
+#-win32
+(defmacro with-args ((var str-list) &body body)

   (with-unique-names (sap size)
     `(multiple-value-bind (,sap ,var ,size)
          (string-list-to-c-strvec ,str-list)
        (unwind-protect
             (progn
               ,@body)
   (with-unique-names (sap size)
     `(multiple-value-bind (,sap ,var ,size)
          (string-list-to-c-strvec ,str-list)
        (unwind-protect
             (progn
               ,@body)

-         (sb-sys:deallocate-system-memory ,sap ,size)))))
+         (deallocate-system-memory ,sap ,size)))))

 
 

+(defmacro with-environment ((var str-list &key null) &body body)
+  (once-only ((null null))
+    (with-unique-names (sap size)
+      `(multiple-value-bind (,sap ,var ,size)
+           (if ,null
+               (values nil (int-sap 0))
+               #-win32 (string-list-to-c-strvec ,str-list)
+               #+win32 (encode-windows-environment ,str-list))
+         (unwind-protect
+              (progn
+                ,@body)
+           (unless ,null
+             (deallocate-system-memory ,sap ,size)))))))

 #-win32
 #-win32

-(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))
+(define-alien-routine spawn
+     int
+  (program c-string)
+  (argv (* c-string))
+  (stdin int)
+  (stdout int)
+  (stderr int)
+  (search int)
+  (envp (* c-string))
+  (pty-name c-string)
+  (wait int)
+  (dir c-string))

 
 #+win32
 
 #+win32

-(sb-alien:define-alien-routine spawn sb-win32::handle
-  (program sb-alien:c-string)
-  (argv (* sb-alien:c-string))
-  (stdin sb-alien:int)
-  (stdout sb-alien:int)
-  (stderr sb-alien:int)
-  (wait sb-alien:int))
-
-;;; Is UNIX-FILENAME the name of a file that we can execute?
-(defun unix-filename-is-executable-p (unix-filename)
-  (let ((filename (coerce unix-filename 'string)))
-    (values (and (eq (sb-unix:unix-file-kind filename) :file)
-                 #-win32
-                 (sb-unix:unix-access filename sb-unix:x_ok)))))
+(defun escape-arg (arg stream)
+  ;; Normally, #\\ doesn't have to be escaped
+  ;; But if #\" follows #\\, then they have to be escaped.
+  ;; Do that by counting the number of consequent backslashes, and
+  ;; upon encoutering #\" immediately after them, output the same
+  ;; number of backslashes, plus one for #\"
+  (write-char #\" stream)
+  (loop with slashes = 0
+        for i below (length arg)
+        for previous-char = #\a then char
+        for char = (char arg i)
+        do
+        (case char
+          (#\"
+           (loop repeat slashes
+                 do (write-char #\\ stream))
+           (write-string "\\\"" stream))
+          (t
+           (write-char char stream)))
+        (case char
+          (#\\
+           (incf slashes))
+          (t
+           (setf slashes 0)))
+        finally
+        ;; The final #\" counts too, but doesn't need to be escaped itself
+        (loop repeat slashes
+              do (write-char #\\ stream)))
+  (write-char #\" stream))

 
 

-(defun find-executable-in-search-path (pathname &optional
-                                       (search-path (posix-getenv "PATH")))
-  #+sb-doc
-  "Find the first executable file matching PATHNAME in any of the
-colon-separated list of pathnames SEARCH-PATH"
-  (let ((program #-win32 pathname
-                 #+win32 (merge-pathnames pathname (make-pathname :type "exe"))))
-   (loop for end =  (position #-win32 #\: #+win32 #\; search-path
-                              :start (if end (1+ end) 0))
-         and start = 0 then (and end (1+ end))
-         while start
-         ;; <Krystof> the truename of a file naming a directory is the
-         ;; directory, at least until pfdietz comes along and says why
-         ;; that's noncompliant  -- CSR, c. 2003-08-10
-         for truename = (probe-file (subseq search-path start end))
-         for fullpath = (when truename
-                          (unix-namestring (merge-pathnames program truename)))
-         when (and fullpath (unix-filename-is-executable-p fullpath))
-         return fullpath)))
+(defun prepare-args (args)
+  (cond #-win32
+        ((every #'simple-string-p args)
+         args)
+        #-win32
+        (t
+         (loop for arg in args
+               collect (coerce arg 'simple-string)))
+        #+win32
+        (t
+         (with-output-to-string (str)
+           (loop for (arg . rest) on args
+                 do
+                 (cond ((find-if (lambda (c) (find c '(#\Space #\Tab #\")))
+                                 arg)
+                        (escape-arg arg str))
+                       (t
+                        (princ arg str)))
+                 (when rest
+                   (write-char #\Space str)))))))

 
 ;;; FIXME: There shouldn't be two semiredundant versions of the
 ;;; documentation. Since this is a public extension function, the
 
 ;;; FIXME: There shouldn't be two semiredundant versions of the
 ;;; documentation. Since this is a public extension function, the

@@ -592,31 +672,34 @@ colon-separated list of pathnames SEARCH-PATH"
 ;;;
 ;;; RUN-PROGRAM returns a PROCESS structure for the process if
 ;;; the fork worked, and NIL if it did not.
 ;;;
 ;;; RUN-PROGRAM returns a PROCESS structure for the process if
 ;;; the fork worked, and NIL if it did not.

-
-#-win32

 (defun run-program (program args
                     &key
                     (env nil env-p)
 (defun run-program (program args
                     &key
                     (env nil env-p)

-                    (environment (if env-p
-                                     (unix-environment-sbcl-from-cmucl env)
-                                     (posix-environ))
-                                 environment-p)
+                    (environment
+                     (when env-p
+                       (unix-environment-sbcl-from-cmucl env))
+                     environment-p)

                     (wait t)
                     search
                     (wait t)
                     search

-                    pty
+                    #-win32 pty

                     input
                     if-input-does-not-exist
                     output
                     (if-output-exists :error)
                     (error :output)
                     (if-error-exists :error)
                     input
                     if-input-does-not-exist
                     output
                     (if-output-exists :error)
                     (error :output)
                     (if-error-exists :error)

-                    status-hook)
+                    status-hook
+                    (external-format :default)
+                    (directory nil directory-p))

   #+sb-doc
   #+sb-doc

-  "RUN-PROGRAM creates a new Unix process running the Unix program
-found in the file specified by the PROGRAM argument. ARGS are the
-standard arguments that can be passed to a Unix program. For no
-arguments, use NIL (which means that just the name of the program is
-passed as arg 0).
+  #.(concatenate
+     'string
+     ;; The Texinfoizer is sensitive to whitespace, so mind the
+     ;; placement of the #-win32 pseudosplicings.
+     "RUN-PROGRAM creates a new process specified by the PROGRAM
+argument. ARGS are the standard arguments that can be passed to a
+program. For no arguments, use NIL (which means that just the
+name of the program is passed as arg 0).

 
 The program arguments and the environment are encoded using the
 default external format for streams.
 
 The program arguments and the environment are encoded using the
 default external format for streams.

@@ -628,17 +711,15 @@ Users Manual for details about the PROCESS structure.
 
    - The SBCL implementation of RUN-PROGRAM, like Perl and many other
      programs, but unlike the original CMU CL implementation, copies
 
    - The SBCL implementation of RUN-PROGRAM, like Perl and many other
      programs, but unlike the original CMU CL implementation, copies

-     the Unix environment by default.
-
+     the Unix environment by default."#-win32"

    - Running Unix programs from a setuid process, or in any other
      situation where the Unix environment is under the control of someone
      else, is a mother lode of security problems. If you are contemplating
      doing this, read about it first. (The Perl community has a lot of good
      documentation about this and other security issues in script-like
    - Running Unix programs from a setuid process, or in any other
      situation where the Unix environment is under the control of someone
      else, is a mother lode of security problems. If you are contemplating
      doing this, read about it first. (The Perl community has a lot of good
      documentation about this and other security issues in script-like

-     programs.)
+     programs.)""

 
    The &KEY arguments have the following meanings:
 
    The &KEY arguments have the following meanings:

-

    :ENVIRONMENT
       a list of STRINGs describing the new Unix environment
       (as in \"man environ\"). The default is to copy the environment of
    :ENVIRONMENT
       a list of STRINGs describing the new Unix environment
       (as in \"man environ\"). The default is to copy the environment of

@@ -647,22 +728,22 @@ Users Manual for details about the PROCESS structure.
       an alternative lossy representation of the new Unix environment,
       for compatibility with CMU CL
    :SEARCH
       an alternative lossy representation of the new Unix environment,
       for compatibility with CMU CL
    :SEARCH

-      Look for PROGRAM in each of the directories along the $PATH
+      Look for PROGRAM in each of the directories in the child's $PATH

       environment variable.  Otherwise an absolute pathname is required.
       environment variable.  Otherwise an absolute pathname is required.

-      (See also FIND-EXECUTABLE-IN-SEARCH-PATH)

    :WAIT
       If non-NIL (default), wait until the created process finishes.  If
    :WAIT
       If non-NIL (default), wait until the created process finishes.  If

-      NIL, continue running Lisp until the program finishes.
+      NIL, continue running Lisp until the program finishes."#-win32"

    :PTY
       Either T, NIL, or a stream.  Unless NIL, the subprocess is established
       under a PTY.  If :pty is a stream, all output to this pty is sent to
       this stream, otherwise the PROCESS-PTY slot is filled in with a stream
    :PTY
       Either T, NIL, or a stream.  Unless NIL, the subprocess is established
       under a PTY.  If :pty is a stream, all output to this pty is sent to
       this stream, otherwise the PROCESS-PTY slot is filled in with a stream

-      connected to pty that can read output and write input.
+      connected to pty that can read output and write input.""

    :INPUT
       Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard
    :INPUT
       Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard

-      input for the current process is inherited.  If NIL, /dev/null
+      input for the current process is inherited.  If NIL, "
+      #-win32"/dev/null"#+win32"nul""

       is used.  If a pathname, the file so specified is used.  If a stream,
       is used.  If a pathname, the file so specified is used.  If a stream,

-      all the input is read from that stream and send to the subprocess.  If
+      all the input is read from that stream and sent to the subprocess.  If

       :STREAM, the PROCESS-INPUT slot is filled in with a stream that sends
       its output to the process. Defaults to NIL.
    :IF-INPUT-DOES-NOT-EXIST (when :INPUT is the name of a file)
       :STREAM, the PROCESS-INPUT slot is filled in with a stream that sends
       its output to the process. Defaults to NIL.
    :IF-INPUT-DOES-NOT-EXIST (when :INPUT is the name of a file)

@@ -672,7 +753,8 @@ Users Manual for details about the PROCESS structure.
          NIL (the default) to return NIL from RUN-PROGRAM
    :OUTPUT
       Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard
          NIL (the default) to return NIL from RUN-PROGRAM
    :OUTPUT
       Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard

-      output for the current process is inherited.  If NIL, /dev/null
+      output for the current process is inherited.  If NIL, "
+      #-win32"/dev/null"#+win32"nul""

       is used.  If a pathname, the file so specified is used.  If a stream,
       all the output from the process is written to this stream. If
       :STREAM, the PROCESS-OUTPUT slot is filled in with a stream that can
       is used.  If a pathname, the file so specified is used.  If a stream,
       all the output from the process is written to this stream. If
       :STREAM, the PROCESS-OUTPUT slot is filled in with a stream that can

@@ -689,406 +771,445 @@ Users Manual for details about the PROCESS structure.
       same place as normal output.
    :STATUS-HOOK
       This is a function the system calls whenever the status of the
       same place as normal output.
    :STATUS-HOOK
       This is a function the system calls whenever the status of the

-      process changes.  The function takes the process as an argument."
+      process changes.  The function takes the process as an argument.
+   :EXTERNAL-FORMAT
+      The external-format to use for :INPUT, :OUTPUT, and :ERROR :STREAMs.
+   :DIRECTORY
+      Specifies the directory in which the program should be run.
+      NIL (the default) means the directory is unchanged.")

   (when (and env-p environment-p)
     (error "can't specify :ENV and :ENVIRONMENT simultaneously"))
   (when (and env-p environment-p)
     (error "can't specify :ENV and :ENVIRONMENT simultaneously"))

-  ;; Make sure that the interrupt handler is installed.
-  (sb-sys:enable-interrupt sb-unix:sigchld #'sigchld-handler)
-  ;; Prepend the program to the argument list.
-  (push (namestring program) args)
-  (let (;; Clear various specials used by GET-DESCRIPTOR-FOR to
-        ;; communicate cleanup info.
-        *close-on-error*
-        *close-in-parent*
-        *handlers-installed*
-        ;; Establish PROC at this level so that we can return it.
-        proc
-        ;; It's friendly to allow the caller to pass any string
-        ;; designator, but internally we'd like SIMPLE-STRINGs.
-        (simple-args (mapcar (lambda (x) (coerce x 'simple-string)) args)))
+  (let* (;; Clear various specials used by GET-DESCRIPTOR-FOR to
+         ;; communicate cleanup info.
+         *close-on-error*
+         *close-in-parent*
+         ;; Some other binding used only on non-Win32.  FIXME:
+         ;; nothing seems to set this.
+         #-win32 *handlers-installed*
+         ;; Establish PROC at this level so that we can return it.
+         proc
+         (progname (native-namestring program))
+         (args (prepare-args (cons progname args)))
+         (directory (and directory-p (native-namestring directory)))
+         ;; Gag.
+         (cookie (list 0)))

     (unwind-protect
     (unwind-protect

-         (let ((pfile
-                (if search
-                    (find-executable-in-search-path program)
-                    (unix-namestring program)))
-               (cookie (list 0)))
-           (unless pfile
-             (error "no such program: ~S" program))
-           (unless (unix-filename-is-executable-p pfile)
-             (error "not executable: ~S" program))
-           (multiple-value-bind (stdin input-stream)
-               (get-descriptor-for input cookie
-                                   :direction :input
-                                   :if-does-not-exist if-input-does-not-exist)
-             (multiple-value-bind (stdout output-stream)
-                 (get-descriptor-for output cookie
-                                     :direction :output
-                                     :if-exists if-output-exists)
-               (multiple-value-bind (stderr error-stream)
-                   (if (eq error :output)
-                       (values stdout output-stream)
-                       (get-descriptor-for error cookie
-                                           :direction :output
-                                           :if-exists if-error-exists))
-                 (multiple-value-bind (pty-name pty-stream)
-                     (open-pty pty cookie)
+         ;; Note: despite the WITH-* names, these macros don't
+         ;; expand into UNWIND-PROTECT forms.  They're just
+         ;; syntactic sugar to make the rest of the routine slightly
+         ;; easier to read.
+         (macrolet ((with-fd-and-stream-for (((fd stream) which &rest args)
+                                             &body body)
+                      `(multiple-value-bind (,fd ,stream)
+                           ,(ecase which
+                              ((:input :output)
+                               `(get-descriptor-for ,@args))
+                              (:error
+                               `(if (eq ,(first args) :output)
+                                    ;; kludge: we expand into
+                                    ;; hard-coded symbols here.
+                                    (values stdout output-stream)
+                                    (get-descriptor-for ,@args))))
+                         (unless ,fd
+                           (return-from run-program))
+                         ,@body))
+                    (with-open-pty (((pty-name pty-stream) (pty cookie))
+                                    &body body)
+                      (declare (ignorable pty-name pty-stream pty cookie))
+                      #+win32
+                      `(progn ,@body)
+                      #-win32
+                      `(multiple-value-bind (,pty-name ,pty-stream)
+                           (open-pty ,pty ,cookie :external-format external-format)
+                         ,@body)))
+           (with-fd-and-stream-for ((stdin input-stream) :input
+                                    input cookie
+                                    :direction :input
+                                    :if-does-not-exist if-input-does-not-exist
+                                    :external-format external-format
+                                    :wait wait)
+             (with-fd-and-stream-for ((stdout output-stream) :output
+                                      output cookie
+                                      :direction :output
+                                      :if-exists if-output-exists
+                                      :external-format external-format)
+               (with-fd-and-stream-for ((stderr error-stream)  :error
+                                        error cookie
+                                        :direction :output
+                                        :if-exists if-error-exists
+                                        :external-format external-format)
+                 (with-open-pty ((pty-name pty-stream) (pty cookie))

                    ;; Make sure we are not notified about the child
                    ;; death before we have installed the PROCESS
                    ;; structure in *ACTIVE-PROCESSES*.
                    ;; Make sure we are not notified about the child
                    ;; death before we have installed the PROCESS
                    ;; structure in *ACTIVE-PROCESSES*.

-                   (with-active-processes-lock ()
-                    (with-c-strvec (args-vec simple-args)
-                      (with-c-strvec (environment-vec environment)
-                        (let ((child-pid
-                               (without-gcing
-                                (spawn pfile args-vec environment-vec pty-name
-                                       stdin stdout stderr))))
-                          (when (< child-pid 0)
-                            (error "couldn't fork child process: ~A"
-                                   (strerror)))
-                          (setf proc (make-process :pid child-pid
-                                                   :%status :running
-                                                   :pty pty-stream
-                                                   :input input-stream
-                                                   :output output-stream
-                                                   :error error-stream
-                                                   :status-hook status-hook
-                                                   :cookie cookie))
-                          (push proc *active-processes*))))))))))
+                   (let (child)
+                     (with-active-processes-lock ()
+                       (with-environment (environment-vec environment
+                                          :null (not (or environment environment-p)))
+                         (setq child
+                               #+win32
+                               (sb-win32::mswin-spawn
+                                progname
+                                args
+                                stdin stdout stderr
+                                search environment-vec wait directory)
+                               #-win32
+                               (with-args (args-vec args)
+                                 (without-gcing
+                                   (spawn progname args-vec
+                                          stdin stdout stderr
+                                          (if search 1 0)
+                                          environment-vec pty-name
+                                          (if wait 1 0) directory))))
+                         (unless (minusp child)
+                           (setf proc
+                                 (make-process
+                                  :input input-stream
+                                  :output output-stream
+                                  :error error-stream
+                                  :status-hook status-hook
+                                  :cookie cookie
+                                  #-win32 :pty #-win32 pty-stream
+                                  :%status #-win32 :running
+                                           #+win32 (if wait
+                                                       :exited
+                                                       :running)
+                                  :pid #-win32 child
+                                       #+win32 (if wait
+                                                   nil
+                                                   child)
+                                  #+win32 :%exit-code #+win32 (and wait child)))
+                           (push proc *active-processes*))))
+                     ;; Report the error outside the lock.
+                     (case child
+                       (-1
+                        (error "Couldn't fork child process: ~A"
+                               (strerror)))
+                       (-2
+                        (error "Couldn't execute ~S: ~A"
+                               progname (strerror)))
+                       (-3
+                        (error "Couldn't change directory to ~S: ~A"
+                               directory (strerror))))))))))

       (dolist (fd *close-in-parent*)
         (sb-unix:unix-close fd))
       (unless proc
         (dolist (fd *close-on-error*)
           (sb-unix:unix-close fd))
       (dolist (fd *close-in-parent*)
         (sb-unix:unix-close fd))
       (unless proc
         (dolist (fd *close-on-error*)
           (sb-unix:unix-close fd))

+        #-win32

         (dolist (handler *handlers-installed*)
         (dolist (handler *handlers-installed*)

-          (sb-sys:remove-fd-handler handler))))
-    (when (and wait proc)
-      (process-wait proc))
-    proc))
-
-#+win32
-(defun run-program (program args
-                    &key
-                    (wait t)
-                    search
-                    input
-                    if-input-does-not-exist
-                    output
-                    (if-output-exists :error)
-                    (error :output)
-                    (if-error-exists :error)
-                    status-hook)
-  "RUN-PROGRAM creates a new process specified by the PROGRAM
-argument. ARGS are the standard arguments that can be passed to a
-program. For no arguments, use NIL (which means that just the name of
-the program is passed as arg 0).
-
-The program arguments will be encoded using the default external
-format for streams.
-
-RUN-PROGRAM will return a PROCESS structure. See the CMU
-Common Lisp Users Manual for details about the PROCESS structure.
-
-   The &KEY arguments have the following meanings:
-     :SEARCH
-        Look for PROGRAM in each of the directories along the $PATH
-        environment variable.  Otherwise an absolute pathname is required.
-        (See also FIND-EXECUTABLE-IN-SEARCH-PATH)
-     :WAIT
-        If non-NIL (default), wait until the created process finishes.  If
-        NIL, continue running Lisp until the program finishes.
-     :INPUT
-        Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard
-        input for the current process is inherited.  If NIL, nul
-        is used.  If a pathname, the file so specified is used.  If a stream,
-        all the input is read from that stream and send to the subprocess.  If
-        :STREAM, the PROCESS-INPUT slot is filled in with a stream that sends
-        its output to the process. Defaults to NIL.
-     :IF-INPUT-DOES-NOT-EXIST (when :INPUT is the name of a file)
-        can be one of:
-           :ERROR to generate an error
-           :CREATE to create an empty file
-           NIL (the default) to return NIL from RUN-PROGRAM
-     :OUTPUT
-        Either T, NIL, a pathname, a stream, or :STREAM.  If T, the standard
-        output for the current process is inherited.  If NIL, nul
-        is used.  If a pathname, the file so specified is used.  If a stream,
-        all the output from the process is written to this stream. If
-        :STREAM, the PROCESS-OUTPUT slot is filled in with a stream that can
-        be read to get the output. Defaults to NIL.
-     :IF-OUTPUT-EXISTS (when :OUTPUT is the name of a file)
-        can be one of:
-           :ERROR (the default) to generate an error
-           :SUPERSEDE to supersede the file with output from the program
-           :APPEND to append output from the program to the file
-           NIL to return NIL from RUN-PROGRAM, without doing anything
-     :ERROR and :IF-ERROR-EXISTS
-        Same as :OUTPUT and :IF-OUTPUT-EXISTS, except that :ERROR can also be
-        specified as :OUTPUT in which case all error output is routed to the
-        same place as normal output.
-     :STATUS-HOOK
-        This is a function the system calls whenever the status of the
-        process changes.  The function takes the process as an argument."
-  ;; Prepend the program to the argument list.
-  (push (namestring program) args)
-  (let (;; Clear various specials used by GET-DESCRIPTOR-FOR to
-        ;; communicate cleanup info.
-        *close-on-error*
-        *close-in-parent*
-        ;; Establish PROC at this level so that we can return it.
-        proc
-        ;; It's friendly to allow the caller to pass any string
-        ;; designator, but internally we'd like SIMPLE-STRINGs.
-        (simple-args
-          (mapcar
-            (lambda (x)
-              (coerce
-                ;; Apparently any spaces or double quotes in the arguments
-                ;; need to be escaped on win32.
-                (if (position-if (lambda (c) (find c '(#\" #\Space))) x)
-                    (write-to-string x)
-                    x)
-                'simple-string))
-            args)))
-    (unwind-protect
-         (let ((pfile
-                (if search
-                    (find-executable-in-search-path program)
-                    (unix-namestring program)))
-               (cookie (list 0)))
-           (unless pfile
-             (error "No such program: ~S" program))
-           (unless (unix-filename-is-executable-p pfile)
-             (error "Not an executable: ~S" program))
-           (multiple-value-bind (stdin input-stream)
-               (get-descriptor-for input cookie
-                                   :direction :input
-                                   :if-does-not-exist if-input-does-not-exist)
-             (multiple-value-bind (stdout output-stream)
-                 (get-descriptor-for output cookie
-                                     :direction :output
-                                     :if-exists if-output-exists)
-               (multiple-value-bind (stderr error-stream)
-                   (if (eq error :output)
-                       (values stdout output-stream)
-                       (get-descriptor-for error cookie
-                                           :direction :output
-                                           :if-exists if-error-exists))
-                    (with-c-strvec (args-vec simple-args)
-                          (let ((handle (without-gcing
-                                         (spawn pfile args-vec
-                                                stdin stdout stderr
-                                                (if wait 1 0)))))
-                            (when (= handle -1)
-                              (error "Couldn't spawn program: ~A" (strerror)))
-                            (setf proc
-                                  (if wait
-                                      (make-process :pid handle
-                                                    :%status :exited
-                                                    :input input-stream
-                                                    :output output-stream
-                                                    :error error-stream
-                                                    :status-hook status-hook
-                                                    :cookie cookie
-                                                    :exit-code handle)
-                                      (make-process :pid handle
-                                                    :%status :running
-                                                    :input input-stream
-                                                    :output output-stream
-                                                    :error error-stream
-                                                    :status-hook status-hook
-                                                    :cookie cookie)))
-                            (push proc *active-processes*)))))))
-      (dolist (fd *close-in-parent*)
-        (sb-unix:unix-close fd)))
-    (unless proc
-      (dolist (fd *close-on-error*)
-        (sb-unix:unix-close fd)))
-
+          (remove-fd-handler handler)))
+      #-win32
+      (when (and wait proc)
+        (unwind-protect
+             (process-wait proc)
+          (dolist (handler *handlers-installed*)
+            (remove-fd-handler handler)))))

     proc))
 
 ;;; Install a handler for any input that shows up on the file
 ;;; descriptor. The handler reads the data and writes it to the
 ;;; stream.
     proc))
 
 ;;; Install a handler for any input that shows up on the file
 ;;; descriptor. The handler reads the data and writes it to the
 ;;; stream.

-(defun copy-descriptor-to-stream (descriptor stream cookie)
+(defun copy-descriptor-to-stream (descriptor stream cookie external-format)

   (incf (car cookie))
   (incf (car cookie))

-  (let ((string (make-string 256 :element-type 'base-char))
-        handler)
+  (let* ((handler nil)
+         (buf (make-array 256 :element-type '(unsigned-byte 8)))
+         (read-end 0)
+         (et (stream-element-type stream))
+         (copy-fun
+          (cond
+            ((member et '(character base-char))
+             (lambda ()
+               (let* ((decode-end read-end)
+                      (string (handler-case
+                                  (octets-to-string
+                                   buf :end read-end
+                                   :external-format external-format)
+                                (end-of-input-in-character (e)
+                                  (setf decode-end
+                                        (octet-decoding-error-start e))
+                                  (octets-to-string
+                                   buf :end decode-end
+                                   :external-format external-format)))))
+                 (unless (zerop (length string))
+                   (write-string string stream)
+                   (when (/= decode-end (length buf))
+                     (replace buf buf :start2 decode-end :end2 read-end))
+                   (decf read-end decode-end)))))
+            ((member et '(:default (unsigned-byte 8)) :test #'equal)
+             (lambda ()
+               (write-sequence buf stream :end read-end)
+               (setf read-end 0)))
+            (t
+             ;; FIXME.
+             (error "Don't know how to copy to stream of element-type ~S"
+                    et)))))

     (setf handler
     (setf handler

-          (sb-sys:add-fd-handler
+          (add-fd-handler

            descriptor
            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: ~
-                                           ~2I~_~A~:>"
-                                     (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 (#-win32(or (and (null count)
-                                                  (eql errno sb-unix:eio))
-                                             (eql count 0))
-                                         #+win32(<= 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: ~
+           :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)
+                         (if (eql sb-unix:eintr readable/errno)
+                             (return)
+                             (error "~@<Couldn't select on sub-process: ~
+                                        ~2I~_~A~:>"
+                                    (strerror readable/errno))))
+                        ((zerop result)
+                         (return))))
+                (multiple-value-bind (count errno)
+                    (with-pinned-objects (buf)
+                      (sb-unix:unix-read descriptor
+                                         (sap+ (vector-sap buf) read-end)
+                                         (- (length buf) read-end)))
+                  (cond
+                    ((and #-win32 (or (and (null count)
+                                           (eql errno sb-unix:eio))
+                                      (eql count 0))
+                          #+win32 (<= count 0))
+                     (remove-fd-handler handler)
+                     (setf handler nil)
+                     (decf (car cookie))
+                     (sb-unix:unix-close descriptor)
+                     (unless (zerop read-end)
+                       ;; Should this be an END-OF-FILE?
+                       (error "~@<non-empty buffer when EOF reached ~
+                               while reading from child: ~S~:>" buf))
+                     (return))
+                    ((null count)
+                     (remove-fd-handler handler)
+                     (setf handler nil)
+                     (decf (car cookie))
+                     (error
+                      "~@<couldn't read input from sub-process: ~

                                      ~2I~_~A~:>"
                                      ~2I~_~A~:>"

-                                 (strerror errno)))
-                               (t
-                                (sb-kernel:copy-ub8-from-system-area
-                                 (alien-sap buf) 0
-                                 string 0
-                                 count)
-                                (write-string string stream
-                                              :end count)))))))))))
+                      (strerror errno)))
+                    (t
+                     (incf read-end count)
+                     (funcall copy-fun))))))))
+    #-win32
+    (push handler *handlers-installed*)))

 
 

-(defun get-stream-fd (stream direction)
+;;; FIXME: something very like this is done in SB-POSIX to treat
+;;; streams as file descriptor designators; maybe we can combine these
+;;; two?  Additionally, as we have a couple of user-defined streams
+;;; libraries, maybe we should have a generic function for doing this,
+;;; so user-defined streams can play nicely with RUN-PROGRAM (and
+;;; maybe also with SB-POSIX)?
+(defun get-stream-fd-and-external-format (stream direction)

   (typecase stream
   (typecase stream

-    (sb-sys:fd-stream
-     (values (sb-sys:fd-stream-fd stream) nil))
+    (fd-stream
+     (values (fd-stream-fd stream) nil (stream-external-format stream)))

     (synonym-stream
     (synonym-stream

-     (get-stream-fd (symbol-value (synonym-stream-symbol stream)) direction))
+     (get-stream-fd-and-external-format
+      (symbol-value (synonym-stream-symbol stream)) direction))

     (two-way-stream
      (ecase direction
        (:input
     (two-way-stream
      (ecase direction
        (:input

-        (get-stream-fd (two-way-stream-input-stream stream) direction))
+        (get-stream-fd-and-external-format
+         (two-way-stream-input-stream stream) direction))

        (:output
        (:output

-        (get-stream-fd (two-way-stream-output-stream stream) direction))))))
+        (get-stream-fd-and-external-format
+         (two-way-stream-output-stream stream) direction))))))

 
 

+(defun get-temporary-directory ()
+  #-win32 (or (sb-ext:posix-getenv "TMPDIR")
+              "/tmp")
+  #+win32 (or (sb-ext:posix-getenv "TEMP")
+              "C:/Temp"))
+
+\f

 ;;; Find a file descriptor to use for object given the direction.
 ;;; Returns the descriptor. If object is :STREAM, returns the created
 ;;; stream as the second value.
 (defun get-descriptor-for (object
                            cookie
                            &rest keys
 ;;; Find a file descriptor to use for object given the direction.
 ;;; Returns the descriptor. If object is :STREAM, returns the created
 ;;; stream as the second value.
 (defun get-descriptor-for (object
                            cookie
                            &rest keys

-                           &key direction
+                           &key direction (external-format :default) wait

                            &allow-other-keys)
                            &allow-other-keys)

-  (cond ((eq object t)
-         ;; No new descriptor is needed.
-         (values -1 nil))
-        ((eq object nil)
-         ;; Use /dev/null.
-         (multiple-value-bind
-               (fd errno)
-             (sb-unix:unix-open #-win32 #.(coerce "/dev/null" 'base-string)
-                                #+win32 #.(coerce "nul" 'base-string)
-                                (case direction
-                                  (:input sb-unix:o_rdonly)
-                                  (:output sb-unix:o_wronly)
-                                  (t sb-unix:o_rdwr))
-                                #o666)
-           (unless fd
-             (error #-win32 "~@<couldn't open \"/dev/null\": ~2I~_~A~:>"
-                    #+win32 "~@<couldn't open \"nul\" device: ~2I~_~A~:>"
-                    (strerror errno)))
-           (push fd *close-in-parent*)
-           (values fd nil)))
-        ((eq object :stream)
-         (multiple-value-bind (read-fd write-fd) (sb-unix:unix-pipe)
-           (unless read-fd
-             (error "couldn't create pipe: ~A" (strerror write-fd)))
-           (case direction
+  (declare (ignore wait)) ;This is explained below.
+  ;; Our use of a temporary file dates back to very old CMUCLs, and
+  ;; was probably only ever intended for use with STRING-STREAMs,
+  ;; which are ordinarily smallish.  However, as we've got
+  ;; user-defined stream classes, we can end up trying to copy
+  ;; arbitrarily much data into the temp file, and so are liable to
+  ;; run afoul of disk quotas or to choke on small /tmp file systems.
+  (flet ((make-temp-fd ()
+           (multiple-value-bind (fd name/errno)
+               (sb-unix:sb-mkstemp (format nil "~a/.run-program-XXXXXX"
+                                           (get-temporary-directory))
+                                   #o0600)
+             (unless fd
+               (error "could not open a temporary file: ~A"
+                      (strerror name/errno)))
+             ;; Can't unlink an open file on Windows
+             #-win32
+             (unless (sb-unix:unix-unlink name/errno)
+               (sb-unix:unix-close fd)
+               (error "failed to unlink ~A" name/errno))
+             fd)))
+    (let ((dev-null #.(coerce #-win32 "/dev/null" #+win32 "nul" 'base-string)))
+      (cond ((eq object t)
+             ;; No new descriptor is needed.
+             (values -1 nil))
+            ((or (eq object nil)
+                 (and (typep object 'broadcast-stream)
+                      (not (broadcast-stream-streams object))))
+             ;; Use /dev/null.
+             (multiple-value-bind
+                   (fd errno)
+                 (sb-unix:unix-open dev-null
+                                    (case direction
+                                      (:input sb-unix:o_rdonly)
+                                      (:output sb-unix:o_wronly)
+                                      (t sb-unix:o_rdwr))
+                                    #o666)
+               (unless fd
+                 (error "~@<couldn't open ~S: ~2I~_~A~:>"
+                        dev-null (strerror errno)))
+               #+win32
+               (setf (sb-win32::inheritable-handle-p fd) t)
+               (push fd *close-in-parent*)
+               (values fd nil)))
+            ((eq object :stream)
+             (multiple-value-bind (read-fd write-fd) (sb-unix:unix-pipe)
+               (unless read-fd
+                 (error "couldn't create pipe: ~A" (strerror write-fd)))
+               #+win32
+               (setf (sb-win32::inheritable-handle-p read-fd)
+                     (eq direction :input)
+                     (sb-win32::inheritable-handle-p write-fd)
+                     (eq direction :output))
+               (case direction
+                 (:input
+                    (push read-fd *close-in-parent*)
+                    (push write-fd *close-on-error*)
+                    (let ((stream (make-fd-stream write-fd :output t
+                                                         :element-type :default
+                                                         :external-format
+                                                         external-format)))
+                      (values read-fd stream)))
+                 (:output
+                    (push read-fd *close-on-error*)
+                    (push write-fd *close-in-parent*)
+                    (let ((stream (make-fd-stream read-fd :input t
+                                                         :element-type :default
+                                                         :external-format
+                                                         external-format)))
+                      (values write-fd stream)))
+                 (t
+                    (sb-unix:unix-close read-fd)
+                    (sb-unix:unix-close write-fd)
+                    (error "Direction must be either :INPUT or :OUTPUT, not ~S."
+                           direction)))))
+            ((or (pathnamep object) (stringp object))
+             ;; GET-DESCRIPTOR-FOR uses &allow-other-keys, so rather
+             ;; than munge the &rest list for OPEN, just disable keyword
+             ;; validation there.
+             (with-open-stream (file (apply #'open object :allow-other-keys t
+                                            keys))
+               (when file
+                 (multiple-value-bind
+                       (fd errno)
+                     (sb-unix:unix-dup (fd-stream-fd file))
+                   (cond (fd
+                          (push fd *close-in-parent*)
+                          (values fd nil))
+                         (t
+                          (error "couldn't duplicate file descriptor: ~A"
+                                 (strerror errno))))))))
+          ((streamp object)
+           (ecase direction

              (:input
              (:input

-              (push read-fd *close-in-parent*)
-              (push write-fd *close-on-error*)
-              (let ((stream (sb-sys:make-fd-stream write-fd :output t
-                                                   :element-type :default)))
-                (values read-fd stream)))
-             (:output
-              (push read-fd *close-on-error*)
-              (push write-fd *close-in-parent*)
-              (let ((stream (sb-sys:make-fd-stream read-fd :input t
-                                                   :element-type :default)))
-                (values write-fd stream)))
-             (t
-              (sb-unix:unix-close read-fd)
-              (sb-unix:unix-close write-fd)
-              (error "Direction must be either :INPUT or :OUTPUT, not ~S."
-                     direction)))))
-        ((or (pathnamep object) (stringp object))
-         (with-open-stream (file (apply #'open object keys))
-           (multiple-value-bind
-                 (fd errno)
-               (sb-unix:unix-dup (sb-sys:fd-stream-fd file))
-             (cond (fd
-                    (push fd *close-in-parent*)
-                    (values fd nil))
-                   (t
-                    (error "couldn't duplicate file descriptor: ~A"
-                           (strerror errno)))))))
-        ((streamp object)
-         (ecase direction
-           (:input
-            (or (get-stream-fd object :input)
-                ;; FIXME: We could use a better way of setting up
-                ;; temporary files
-                (dotimes (count
-                           256
-                          (error "could not open a temporary file in /tmp"))
-                  (let* ((name (coerce (format nil "/tmp/.run-program-~D" count)
-                                       'base-string))
-                         (fd (sb-unix:unix-open name
-                                                (logior sb-unix:o_rdwr
-                                                        sb-unix:o_creat
-                                                        sb-unix:o_excl)
-                                                #o666)))
-                    (sb-unix:unix-unlink name)
-                    (when fd
-                      (let ((newline (string #\Newline)))
-                        (loop
+              (block nil
+                ;; If we can get an fd for the stream, let the child
+                ;; process use the fd for its descriptor.  Otherwise,
+                ;; we copy data from the stream into a temp file, and
+                ;; give the temp file's descriptor to the
+                ;; child.
+                (multiple-value-bind (fd stream format)
+                    (get-stream-fd-and-external-format object :input)
+                  (declare (ignore format))
+                  (when fd
+                    (return (values fd stream))))
+                ;; FIXME: if we can't get the file descriptor, since
+                ;; the stream might be interactive or otherwise
+                ;; block-y, we can't know whether we can copy the
+                ;; stream's data to a temp file, so if RUN-PROGRAM was
+                ;; called with :WAIT NIL, we should probably error.
+                ;; However, STRING-STREAMs aren't fd-streams, but
+                ;; they're not prone to blocking; any user-defined
+                ;; streams that "read" from some in-memory data will
+                ;; probably be similar to STRING-STREAMs.  So maybe we
+                ;; should add a STREAM-INTERACTIVE-P generic function
+                ;; for problems like this?  Anyway, the machinery is
+                ;; here, if you feel like filling in the details.
+                #|
+                (when (and (null wait) #<some undetermined criterion>)
+                  (error "~@<don't know how to get an fd for ~A, and so ~
+                             can't ensure that copying its data to the ~
+                             child process won't hang~:>" object))
+                |#
+                (let ((fd (make-temp-fd))
+                      (et (stream-element-type object)))
+                  (cond ((member et '(character base-char))
+                         (loop

                            (multiple-value-bind
                                  (line no-cr)
                                (read-line object nil nil)
                              (unless line
                                (return))
                            (multiple-value-bind
                                  (line no-cr)
                                (read-line object nil nil)
                              (unless line
                                (return))

-                             (sb-unix:unix-write
-                              fd
-                              ;; FIXME: this really should be
-                              ;; (STRING-TO-OCTETS :EXTERNAL-FORMAT ...).
-                              ;; RUN-PROGRAM should take an
-                              ;; external-format argument, which should
-                              ;; be passed down to here.  Something
-                              ;; similar should happen on :OUTPUT, too.
-                              (map '(vector (unsigned-byte 8)) #'char-code line)
-                              0 (length line))
+                             (let ((vector (string-to-octets
+                                            line
+                                            :external-format external-format)))
+                               (sb-unix:unix-write
+                                fd vector 0 (length vector)))

                              (if no-cr
                              (if no-cr

-                                 (return)
-                                 (sb-unix:unix-write fd newline 0 1)))))
-                      (sb-unix:unix-lseek fd 0 sb-unix:l_set)
-                      (push fd *close-in-parent*)
-                      (return (values fd nil)))))))
-           (:output
-            (or (get-stream-fd object :output)
+                               (return)
+                               (sb-unix:unix-write
+                                fd #.(string #\Newline) 0 1)))))
+                        ((member et '(:default (unsigned-byte 8))
+                                 :test 'equal)
+                         (loop with buf = (make-array 256 :element-type '(unsigned-byte 8))
+                               for p = (read-sequence buf object)
+                               until (zerop p)
+                               do (sb-unix:unix-write fd buf 0 p)))
+                        (t
+                         (error "Don't know how to copy from stream of element-type ~S"
+                                et)))
+                  (sb-unix:unix-lseek fd 0 sb-unix:l_set)
+                  (push fd *close-in-parent*)
+                  (return (values fd nil)))))
+             (:output
+              (block nil
+                ;; Similar to the :input trick above, except we
+                ;; arrange to copy data from the stream.  This is
+                ;; slightly saner than the input case, since we don't
+                ;; buffer to a file, but I think we may still lose if
+                ;; there's unflushed data in the stream buffer and we
+                ;; give the file descriptor to the child.
+                (multiple-value-bind (fd stream format)
+                    (get-stream-fd-and-external-format object :output)
+                  (declare (ignore format))
+                  (when fd
+                    (return (values fd stream))))

                 (multiple-value-bind (read-fd write-fd)
                     (sb-unix:unix-pipe)
                   (unless read-fd
                     (error "couldn't create pipe: ~S" (strerror write-fd)))
                 (multiple-value-bind (read-fd write-fd)
                     (sb-unix:unix-pipe)
                   (unless read-fd
                     (error "couldn't create pipe: ~S" (strerror write-fd)))

-                  (copy-descriptor-to-stream read-fd object cookie)
+                  (copy-descriptor-to-stream read-fd object cookie
+                                             external-format)

                   (push read-fd *close-on-error*)
                   (push write-fd *close-in-parent*)
                   (push read-fd *close-on-error*)
                   (push write-fd *close-in-parent*)

-                  (values write-fd nil))))))
-        (t
-         (error "invalid option to RUN-PROGRAM: ~S" object))))
+                  (return (values write-fd nil)))))
+             (t
+              (error "invalid option to RUN-PROGRAM: ~S" object))))))))