CMUCL commit: src/code (pathname.lisp)

[Raymond Toy]

    Date: Sunday, January 31, 2010 @ 11:10:36
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code

Modified: pathname.lisp

Adjust TRANSLATE-DIRECTORIES to make the result be a relative or
absolute directory according to whether the TO directory is relative
or absolute.  Previously, the result was taken from the SOURCE
directory, unless the TO directory was absolute.

See cmucl-help, 2010/01/29.


---------------+
 pathname.lisp |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)


Index: src/code/pathname.lisp
diff -u src/code/pathname.lisp:1.88 src/code/pathname.lisp:1.89
--- src/code/pathname.lisp:1.88	Thu Aug 13 15:23:42 2009
+++ src/code/pathname.lisp	Sun Jan 31 11:10:35 2010
@@ -4,7 +4,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/pathname.lisp,v 1.88 2009-08-13 19:23:42 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/pathname.lisp,v 1.89 2010-01-31 16:10:35 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1406,8 +1406,7 @@
 ;;;    Called by TRANSLATE-PATHNAME on the directory components of its argument
 ;;; pathanames to produce the result directory component.  If any leaves the
 ;;; directory NIL, we return the source directory.  The :RELATIVE or :ABSOLUTE
-;;; is taken from the source directory, except if TO is :ABSOLUTE, in which
-;;; case the result will be :ABSOLUTE.
+;;; is taken from the TO directory.
 ;;;
 (defun translate-directories (source from to diddle-case)
   (if (not (and source to from))
@@ -1434,9 +1433,7 @@
 			 (res to-part)))))
 	      (res))))
       (collect ((res))
-	(res (if (eq (first to) :absolute)
-		 :absolute
-		 (first source)))
+	(res (first to))
 	(let ((subs-left (compute-directory-substitutions (rest source)
 							  (rest from))))
 	  (dolist (to-part (rest to))