CMUCL commit: src (3 files)

[Raymond Toy]

    Date: Monday, June 7, 2010 @ 18:10:12
  Author: rtoy
    Path: /project/cmucl/cvsroot/src

Modified: code/fd-stream.lisp code/filesys.lisp general-info/release-20b.txt

code/fd-stream.lisp:
o OPEN merges the filename with *DEFAULT-PATHNAME-DEFAULTS*, as
  required by CLHS sec 19.2.3.

code/filesys.lisp:
o DELETE-FILE, ENSURE-DIRECTORIES-EXIST, and FILE-AUTHOR merge the
  filename with *DEFAULT-PATHNAME-DEFAULTS*, as required by CLHS sec
  19.2.3.

general-info/release-20b.txt:
o Update.


------------------------------+
 code/fd-stream.lisp          |    4 ++--
 code/filesys.lisp            |    8 ++++----
 general-info/release-20b.txt |    3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)


Index: src/code/fd-stream.lisp
diff -u src/code/fd-stream.lisp:1.100 src/code/fd-stream.lisp:1.101
--- src/code/fd-stream.lisp:1.100	Tue Apr 20 13:57:44 2010
+++ src/code/fd-stream.lisp	Mon Jun  7 18:10:11 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.100 2010-04-20 17:57:44 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.101 2010-06-07 22:10:11 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -2171,7 +2171,7 @@
 			 :if-does-not-exist))
     (setf (getf options :if-does-not-exist) if-does-not-exist))
 
-  (let ((filespec (pathname filename))
+  (let ((filespec (merge-pathnames filename))
 	(options (copy-list options))
 	(class (or class 'fd-stream)))
     (cond ((eq class 'fd-stream)
Index: src/code/filesys.lisp
diff -u src/code/filesys.lisp:1.110 src/code/filesys.lisp:1.111
--- src/code/filesys.lisp:1.110	Tue Apr 20 13:57:44 2010
+++ src/code/filesys.lisp	Mon Jun  7 18:10:11 2010
@@ -6,7 +6,7 @@
 ;;; Scott Fahlman or slisp-group at cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/filesys.lisp,v 1.110 2010-04-20 17:57:44 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/filesys.lisp,v 1.111 2010-06-07 22:10:11 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -961,7 +961,7 @@
 ;;;
 (defun delete-file (file)
   "Delete the specified file."
-  (let ((namestring (unix-namestring file t)))
+  (let ((namestring (unix-namestring (merge-pathnames file) t)))
     (when (streamp file)
       ;; Close the file, but don't try to revert or anything.  We want
       ;; to delete it, man!
@@ -1054,7 +1054,7 @@
       (error 'simple-file-error
 	     :pathname file
 	     :format-control (intl:gettext "Bad place for a wild pathname."))
-      (let ((name (unix-namestring (pathname file) t)))
+      (let ((name (unix-namestring (merge-pathnames file) t)))
 	(unless name
 	  (error 'simple-file-error
 		 :pathname file
@@ -1458,7 +1458,7 @@
   "Tests whether the directories containing the specified file
   actually exist, and attempts to create them if they do not.
   Portable programs should avoid using the :MODE keyword argument."
-  (let* ((pathname (pathname pathspec))
+  (let* ((pathname (merge-pathnames pathspec))
 	 (pathname (if (logical-pathname-p pathname)
 		       (translate-logical-pathname pathname)
 		       pathname))
Index: src/general-info/release-20b.txt
diff -u src/general-info/release-20b.txt:1.28 src/general-info/release-20b.txt:1.29
--- src/general-info/release-20b.txt:1.28	Tue May 25 16:04:33 2010
+++ src/general-info/release-20b.txt	Mon Jun  7 18:10:12 2010
@@ -77,6 +77,9 @@
     - DEFINE-COMPILER-MACRO no longer sets the wrong block name for
       SETF functions.  We also check that the name is a valid function
       name; an error is signaled if it's invalid.
+    - DELETE-FILE, ENSURE-DIRECTORIES-EXIST, FILE-AUTHOR, and OPEN now
+      merge the given pathname with *DEFAULT-PATHNAME-DEFAULTS* as
+      required by CLHS sec 19.2.3.
 
   * Bugfixes:
     - On Unicode builds, printing of '|\|| and '|`| was incorrect