X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fos.lisp;h=918425cd80ccb6cd581b0b39be0b6f380ec5d1cc;hb=944a7d156be31efb1c01b9dfc49a5661a825eced;hp=f9cc31f0a31dea5ffe6a3180440500374f519370;hpb=c6c305a69913c148753813cc057be7127017ae6a;p=uffi.git diff --git a/src/os.lisp b/src/os.lisp index f9cc31f..918425c 100644 --- a/src/os.lisp +++ b/src/os.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Sep 2002 ;;;; -;;;; $Id: os.lisp,v 1.1 2002/10/14 01:51:15 kevin Exp $ +;;;; $Id: os.lisp,v 1.4 2002/10/23 19:51:20 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg. ;;;; Much of this code was taken from other open source project and copyright @@ -22,36 +22,38 @@ (in-package :uffi) -;; Take from ASDF -- Copyright Dan Barlow and Contributors +;; modified from function ASDF -- Copyright Dan Barlow and Contributors -(defun run-shell-command (control-string &rest args) +(defun run-shell-command (control-string &rest args &key output) "Interpolate ARGS into CONTROL-STRING as if by FORMAT, and synchronously execute the result using a Bourne-compatible shell, with output to *trace-output*. Returns the shell's exit code." + (unless output + (setq output *trace-output*)) + (let ((command (apply #'format nil control-string args))) - (format *trace-output* "; $ ~A~%" command) #+sbcl (sb-impl::process-exit-code (sb-ext:run-program "/bin/sh" - (list "-c" command) - :input nil :output *trace-output*)) + (list "-c" command) + :input nil :output output)) #+(or cmu scl) (ext:process-exit-code (ext:run-program "/bin/sh" - (list "-c" command) - :input nil :output *trace-output*)) + (list "-c" command) + :input nil :output output)) #+allegro - (excl:run-shell-command command :input nil :output *trace-output*) + (excl:run-shell-command command :input nil :output output) #+lispworks (system:call-system-showing-output command :shell-type "/bin/sh" - :output-stream *trace-output*) + :output-stream output) #+clisp ;XXX not exactly *trace-output*, I know (ext:run-shell-command command :output :terminal :wait t) @@ -60,7 +62,7 @@ output to *trace-output*. Returns the shell's exit code." (nth-value 1 (ccl:external-process-status (ccl:run-program "/bin/sh" (list "-c" command) - :input nil :output *trace-output* + :input nil :output output :wait t))) #-(or openmcl clisp lispworks allegro scl cmu sbcl)