X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=os.lisp;h=954a27f84796e1d277d29cd14319e60a92f01883;hp=589eac4b74e89a2ef798ce01030315a3770a87b9;hb=19bee416d52c52d58261faf3d459c45572563149;hpb=526eef1b59e071cbb4ecd35f73a14c1a3f8e32b6

diff --git a/os.lisp b/os.lisp
index 589eac4..954a27f 100644
--- a/os.lisp
+++ b/os.lisp
@@ -19,43 +19,65 @@ 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
-    (sb-impl::process-exit-code
-     (sb-ext:run-program  
-      "/bin/sh"
-      (list  "-c" command)
-      :input nil :output nil))
+    (let ((process (sb-ext:run-program  
+		    "/bin/sh"
+		    (list "-c" command)
+		    :input nil :output :stream :error :stream)))
+      (values
+       (sb-impl::process-output process)
+       (sb-impl::process-error process)
+       (sb-impl::process-exit-code process)))
     
     #+(or cmu scl)
-    (ext:process-exit-code
-     (ext:run-program  
-      "/bin/sh"
-      (list  "-c" command)
-      :input nil :output nil))
-    
+    (let ((process (ext:run-program  
+		    "/bin/sh"
+		    (list "-c" command)
+		    :input nil :output :stream :error :stream)))
+      (values
+       (ext::process-output process)
+       (ext::process-error process)
+       (ext::process-exit-code process)))    
 
     #+allegro
     (multiple-value-bind (output error status)
-	(excl.osi:command-output command)
+	(excl.osi:command-output command :whole t)
       (values output error status))
     
     #+lispworks
-    (system:call-system-showing-output
-     command
-     :shell-type "/bin/sh"
-     :output-stream output)
+    ;; BUG: Lispworks combines output and error streams
+    (let ((output (make-output-string-stream)))
+      (unwind-protect
+	  (let ((status 
+		 (system:call-system-showing-output
+		  command
+		  :shell-type "/bin/sh"
+		  :output-stream output)))
+	    (values (get-output-string output) nil status))
+	(close output)))
     
-    #+clisp		;XXX not exactly *verbose-out*, I know
-    (ext:run-shell-command  command :output :terminal :wait t)
+    #+clisp		
+    ;; BUG: CLisp doesn't allow output to user-specified stream
+    (values
+     nil
+     nil
+     (ext:run-shell-command  command :output :terminal :wait t))
     
     #+openmcl
-    (nth-value 1
-	       (ccl:external-process-status
-		(ccl:run-program "/bin/sh" (list "-c" command)
-				 :input nil :output nil
-				 :wait t)))
-	   
+    (let* ((process (ccl:run-program  
+		     "/bin/sh"
+		     (list "-c" command)
+		     :input nil :output :stream :error :stream
+		     :wait t))
+	   (output (read-stream-to-string (ccl::external-process-output-stream process)))
+	   (error (read-stream-to-string (ccl::external-process-error-stream process))))
+      (close (ccl::external-process-output-stream process))
+      (close (ccl::external-process-error-stream process))
+      (values output
+	      error
+	      (nth-value 1 (ccl::external-process-status process))))
+  
     #-(or openmcl clisp lispworks allegro scl cmu sbcl)
-    (error "RUN-SHELL-PROGRAM not implemented for this Lisp")
+    (error "COMMAND-OUTPUT not implemented for this Lisp")
 
     ))