From 76d158a36bde53452e8724b2202dd3ccf6c2da40 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 19 Apr 2004 06:32:34 +0000 Subject: [PATCH] r9086: Automated commit for Debian build of kmrcl upstream-version-1.69 --- debian/changelog | 6 ++++++ os.lisp | 34 ++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac0451a..22392e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-kmrcl (1.69-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Mon, 19 Apr 2004 00:31:38 -0600 + cl-kmrcl (1.68-1) unstable; urgency=low * New upstream diff --git a/os.lisp b/os.lisp index 818a4da..2e52441 100644 --- a/os.lisp +++ b/os.lisp @@ -19,24 +19,34 @@ synchronously execute the result using a Bourne-compatible shell, returns (VALUES string-output error-output exit-status)" (let ((command (apply #'format nil control-string args))) #+sbcl - (let ((process (sb-ext:run-program + (let* ((process (sb-ext:run-program "/bin/sh" (list "-c" command) - :input nil :output :stream :error :stream))) + :input nil :output :stream :error :stream)) + (output (read-stream-to-string (sb-impl::process-output process))) + (error (read-stream-to-string (sb-impl::process-error process)))) + (close (sb-impl::process-output process)) + (close (sb-impl::process-error process)) (values - (sb-impl::process-output process) - (sb-impl::process-error process) - (sb-impl::process-exit-code process))) + output + error + (sb-impl::process-exit-code process))) + #+(or cmu scl) - (let ((process (ext:run-program - "/bin/sh" - (list "-c" command) - :input nil :output :stream :error :stream))) + (let* ((process (ext:run-program + "/bin/sh" + (list "-c" command) + :input nil :output :stream :error :stream)) + (output (read-stream-to-string (ext::process-output process))) + (error (read-stream-to-string (ext::process-error process)))) + (close (ext::process-output process)) + (close (ext::process-error process)) + (values - (ext::process-output process) - (ext::process-error process) - (ext::process-exit-code process))) + output + error + (ext::process-exit-code process))) #+allegro (multiple-value-bind (output error status) -- 2.34.1