From 7fd52b8de887a2a328f78bddb6a2fb4230ef2b3a Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 19 Apr 2004 06:33:19 +0000
Subject: [PATCH] r9087: Automated commit for Debian build of clsql
 upstream-version-2.7.10

---
 ChangeLog              |  4 ++++
 base/db-interface.lisp |  3 ---
 base/utils.lisp        | 32 +++++++++++++++++++++-----------
 debian/changelog       |  6 ++++++
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ea33bc..7fbde1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+19 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+	* Version 2.7.10
+	* base/utils.lisp: Fix command-output on CMUCL/SBCL
+
 18 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
 	* Version 2.7.9
 	* db-sqlite/sqlite-sql.lisp: Fix sequence functions.
diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index b2ba6e5..fa07af9 100644
--- a/base/db-interface.lisp
+++ b/base/db-interface.lisp
@@ -118,9 +118,6 @@ returns nil when result-set is finished."))
 if not found. May signal an error if unable to communicate with database server."))
 
 (defgeneric database-destroy (connection-spec database)
-  (:method (connection-spec (database t))
-	   (declare (ignore connection-spec))
-	   (signal-no-database-error database))
   (:documentation "Destroys (drops) a database."))
 
 (defgeneric database-truncate (database)
diff --git a/base/utils.lisp b/base/utils.lisp
index 2456d36..84e28b9 100644
--- a/base/utils.lisp
+++ b/base/utils.lisp
@@ -185,23 +185,33 @@ 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)
+       output
+       error
        (ext::process-exit-code process)))    
 
     #+allegro
diff --git a/debian/changelog b/debian/changelog
index b9f2830..48ac3b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.7.10-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 19 Apr 2004 00:21:37 -0600
+
 cl-sql (2.7.9-1) unstable; urgency=low
 
   * New upstream
-- 
2.34.1