X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffilesys.lisp;fp=src%2Fcode%2Ffilesys.lisp;h=c25818fe2454d9b413dc95cd709e72bd9fd8c9d0;hb=2a0f8515245d080dee97b72ee910c5dcbc4fc5e4;hp=8817dcf3a2263d24f7631eed1740f8224aa5b1e3;hpb=1e006a573276971ed6e1bf91e9f2ddc402cb449e;p=sbcl.git diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index 8817dcf..c25818f 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -493,9 +493,9 @@ If FILE is a stream, on Windows the stream is closed immediately. On Unix plaforms the stream remains open, allowing IO to continue: the OS resources associated with the deleted file remain available till the stream is closed as per standard Unix unlink() behaviour." - (let* ((pathname (translate-logical-pathname file)) + (let* ((pathname (translate-logical-pathname + (merge-pathnames file (sane-default-pathname-defaults)))) (namestring (native-namestring pathname :as-file t))) - (truename file) ; for error-checking side-effect #!+win32 (when (streamp file) (close file)) @@ -518,9 +518,7 @@ the directory could not be deleted for any reason. \(DELETE-DIRECTORY \"/tmp/foo\") and \(DELETE-DIRECTORY \"/tmp/foo/\") both delete the \"foo\" subdirectory of \"/tmp\", or signal an error if it does not -exist or is a file. - -Experimental: interface subject to change." +exist or is a file." (declare (type pathname-designator pathspec)) (with-pathname (pathname pathspec) (let ((truename (truename (translate-logical-pathname pathname))))