From c7142fb2d5f30fcdbcd89e37e46e5be02ecc97b2 Mon Sep 17 00:00:00 2001
From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Wed, 19 Jul 2006 11:31:49 +0000
Subject: [PATCH] 0.9.14.24: 	Fix PFD ansi-tests ENSURE-DIRECTORIES-EXIST.8

---
 NEWS                                   | 13 ++++++++-----
 src/code/filesys.lisp                  |  2 +-
 tests/side-effectful-pathnames.test.sh |  4 ++--
 version.lisp-expr                      |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 306fc54be..54afc8bbc 100644
--- a/NEWS
+++ b/NEWS
@@ -31,11 +31,14 @@ changes in sbcl-0.9.15 relative to sbcl-0.9.14:
     and EQL-SPECIALIZERs) can be used as specializers to DEFMETHOD.
     (reported by Pascal Costanza)
   * minor code generation optimizations:
-    * better register allocation in CLOS dispatching functions
-    * overflow detection when coercing signed bytes to fixnums on x86-64 
-      is now implemented with one IMUL instruction instead of three shifts
-    * more efficient bit-vector access on x86 and x86-64
-    * more efficient access to raw structure slots on x86 and x86-64
+    ** better register allocation in CLOS dispatching functions
+    ** overflow detection when coercing signed bytes to fixnums on x86-64 
+    ** is now implemented with one IMUL instruction instead of three shifts
+    ** more efficient bit-vector access on x86 and x86-64
+    ** more efficient access to raw structure slots on x86 and x86-64
+  * fixed some bugs revealed by Paul Dietz' test suite:
+    ** ENSURE-DIRECTORIES-EXIST.8: ENSURE-DIRECTORIES-EXIST must
+       return its argument.
 
 changes in sbcl-0.9.14 relative to sbcl-0.9.13:
   * feature: thread support on Solaris/x86, and experimental thread support
diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp
index 55ca37e95..d1de6bea1 100644
--- a/src/code/filesys.lisp
+++ b/src/code/filesys.lisp
@@ -866,6 +866,6 @@ system."
                            :report "Continue as if directory creation was successful."
                            nil)))
                      (setf created-p t)))))
-      (values pathname created-p))))
+      (values pathspec created-p))))
 
 (/show0 "filesys.lisp 1000")
diff --git a/tests/side-effectful-pathnames.test.sh b/tests/side-effectful-pathnames.test.sh
index 780f11d61..b2236e682 100644
--- a/tests/side-effectful-pathnames.test.sh
+++ b/tests/side-effectful-pathnames.test.sh
@@ -71,8 +71,8 @@ $SBCL <<EOF
 (let ((rel-name #p"foo/bar/")
       (abs-name (merge-pathnames #p"baz/quux/" (truename "."))))
   (and
-   (ensure-directories-exist abs-name)
-   (ensure-directories-exist rel-name)
+   (equalp (ensure-directories-exist abs-name) abs-name)
+   (equalp (ensure-directories-exist rel-name) rel-name)
    (sb-ext:quit :unix-status 52)))
 EOF
 if [ $? != 52 ]; then
diff --git a/version.lisp-expr b/version.lisp-expr
index d92ce8e99..96a42dfc8 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.14.23"
+"0.9.14.24"
-- 
2.11.4.GIT