X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=4dbcc554a526232a9de09f9b10708cf3180bfe3f;hb=b0b168c08b31a748150f404398af754f26fd4813;hp=b00f92e9858527a86be9b33693b83b3cf7ce18cf;hpb=53e7a02c819090af8e6db7e47d29cdbb5296814f;p=sbcl.git diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp index b00f92e..4dbcc55 100644 --- a/src/code/run-program.lisp +++ b/src/code/run-program.lisp @@ -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.) ;;;; hacking the Unix environment ;;;; @@ -45,17 +45,26 @@ ;;;; 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-variable "environ" (* c-string)) +(push (lambda () + ;; We redo this here to protect ourselves from this scenario: + ;; * Build under one version of shared lib, save a core. + ;; * Load core under another version of shared lib. ("Now + ;; where was environ again?" SIGSEGV, etc.) + ;; Obviously it's a KLUDGE to do this hack for every alien + ;; variable, but as it happens, as of sbcl-0.7.0 this is the + ;; only alien variable used to implement SBCL, so it's not + ;; worth coming up with a general solution. (A general + ;; solution would be nice for users who want to have their + ;; alien code be preserved across a save/load cycle, but this + ;; problem with alien variables is only one of several + ;; problems which'd need to be solved before that can happen.) + (define-alien-variable "environ" (* c-string))) + *after-save-initializations*) (defun posix-environ () "Return the Unix environment (\"man environ\") as a list of SIMPLE-STRINGs." - (let ((reversed-result nil)) - (dotimes (i most-positive-fixnum (error "can't happen")) - (declare (type index i)) - (let ((env-item (deref environ i))) - (if env-item - (push env-item reversed-result) - (return (nreverse reversed-result))))))) + (c-strings->string-list environ)) ;;; Convert as best we can from a SBCL representation of a Unix ;;; environment to a CMU CL representation. @@ -99,7 +108,7 @@ ;;;; Import wait3(2) from Unix. -(sb-alien:def-alien-routine ("wait3" c-wait3) sb-c-call:int +(sb-alien:define-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)) @@ -165,7 +174,7 @@ (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) @@ -200,8 +209,7 @@ sb-unix:TIOCGPGRP (sb-alien:alien-sap (sb-alien:addr result))) (unless wonp - (error "TIOCPGRP ioctl failed: ~S" - (sb-unix:get-unix-error-msg error))) + (error "TIOCPGRP ioctl failed: ~S" (strerror error))) result)) (process-pid proc)) @@ -297,7 +305,7 @@ (defvar *handlers-installed* nil) #+FreeBSD -(def-alien-type nil +(define-alien-type nil (struct sgttyb (sg-ispeed sb-c-call:char) ; input speed (sg-ospeed sb-c-call:char) ; output speed @@ -305,7 +313,7 @@ (sg-kill sb-c-call:char) ; kill character (sg-flags sb-c-call:short))) ; mode flags #+OpenBSD -(def-alien-type nil +(define-alien-type nil (struct sgttyb (sg-four sb-c-call:int) (sg-chars (array sb-c-call:char 4)) @@ -372,8 +380,7 @@ (when (streamp pty) (multiple-value-bind (new-fd errno) (sb-unix:unix-dup master) (unless new-fd - (error "could not SB-UNIX:UNIX-DUP ~D: ~S" - master (sb-unix:get-unix-error-msg 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 @@ -391,7 +398,7 @@ (vec-bytes (* #-alpha 4 #+alpha 8 (+ (length string-list) 2)))) (declare (fixnum string-bytes vec-bytes)) (dolist (s string-list) - (check-type s simple-string) + (enforce-type s simple-string) (incf string-bytes (round-bytes-to-words (1+ (length s))))) ;; Now allocate the memory and fill it in. (let* ((total-bytes (+ string-bytes vec-bytes)) @@ -406,9 +413,9 @@ ;; 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)))) @@ -428,7 +435,7 @@ ,@body) (sb-sys:deallocate-system-memory ,sap ,size))))) -(sb-alien:def-alien-routine spawn sb-c-call:int +(sb-alien:define-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)) @@ -437,6 +444,12 @@ (stdout sb-c-call:int) (stderr sb-c-call:int)) +;;; Is UNIX-FILENAME the name of a file that we can execute? +(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) + (sb-unix:unix-access unix-filename sb-unix:x_ok)))) + ;;; FIXME: There shouldn't be two semiredundant versions of the ;;; documentation. Since this is a public extension function, the ;;; documentation should be in the doc string. So all information from @@ -515,7 +528,7 @@ documentation about this and other security issues in script-like programs.) - The keyword arguments have the following meanings: + The &KEY arguments have the following meanings: :ENVIRONMENT a list of SIMPLE-STRINGs describing the new Unix environment (as in \"man environ\"). The default is to copy the environment of @@ -588,13 +601,15 @@ ;; "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) - (pfile (unix-namestring program t t)) + ;; 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 (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 @@ -622,8 +637,8 @@ (spawn pfile args-vec environment-vec pty-name stdin stdout stderr)))) (when (< child-pid 0) - (error "could not fork child process: ~S" - (sb-unix:get-unix-error-msg))) + (error "couldn't fork child process: ~A" + (strerror))) (setf proc (make-process :pid child-pid :%status :running :pty pty-stream @@ -654,52 +669,54 @@ (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 "could not select on sub-process: ~S" - (sb-unix:get-unix-error-msg - 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 "could not read input from sub-process: ~S" - (sb-unix:get-unix-error-msg 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))))))))))) + :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 "~@" + (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 + "~@" + (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 @@ -723,17 +740,14 @@ (t sb-unix:o_rdwr)) #o666) (unless fd - (error "could not open \"/dev/null\": ~S" - (sb-unix:get-unix-error-msg errno))) + (error "~@" + (strerror errno))) (push fd *close-in-parent*) (values fd nil))) ((eq object :stream) - (multiple-value-bind - (read-fd write-fd) - (sb-unix:unix-pipe) + (multiple-value-bind (read-fd write-fd) (sb-unix:unix-pipe) (unless read-fd - (error "could not create pipe: ~S" - (sb-unix:get-unix-error-msg write-fd))) + (error "couldn't create pipe: ~A" (strerror write-fd))) (case direction (:input (push read-fd *close-in-parent*) @@ -759,8 +773,8 @@ (push fd *close-in-parent*) (values fd nil)) (t - (error "could not duplicate file descriptor: ~S" - (sb-unix:get-unix-error-msg errno))))))) + (error "couldn't duplicate file descriptor: ~A" + (strerror errno))))))) ((sb-sys:fd-stream-p object) (values (sb-sys:fd-stream-fd object) nil)) ((streamp object) @@ -797,8 +811,7 @@ (multiple-value-bind (read-fd write-fd) (sb-unix:unix-pipe) (unless read-fd - (error "could not create pipe: ~S" - (sb-unix:get-unix-error-msg write-fd))) + (error "couldn't create pipe: ~S" (strerror write-fd))) (copy-descriptor-to-stream read-fd object cookie) (push read-fd *close-on-error*) (push write-fd *close-in-parent*)