r9086: Automated commit for Debian build of kmrcl upstream-version-1.69
authorKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 19 Apr 2004 06:32:34 +0000 (06:32 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 19 Apr 2004 06:32:34 +0000 (06:32 +0000)
debian/changelog
os.lisp

index ac0451ace48d8b619e27e301907a49022c9ce6ee..22392e93edef967fdefbb6bf94291bcd5b94acdb 100644 (file)
@@ -1,3 +1,9 @@
+cl-kmrcl (1.69-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 19 Apr 2004 00:31:38 -0600
+
 cl-kmrcl (1.68-1) unstable; urgency=low
 
   * New upstream
 cl-kmrcl (1.68-1) unstable; urgency=low
 
   * New upstream
diff --git a/os.lisp b/os.lisp
index 818a4da07f2f7d78508b3b3e44cbfb95acd0dfd1..2e524416e83e2d06d620437170fb11f7c8d00907 100644 (file)
--- 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
 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)
                    "/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
       (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)
     
     #+(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
       (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)
 
     #+allegro
     (multiple-value-bind (output error status)