X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-pathname.lisp;h=4b9e7661d8cb02d7ad3eae3a073c820afa8462a6;hb=cee8ef591040db9a79cdd19297867672a9529051;hp=c1deb5ac621ba0a5bbf87078bdced3848651a917;hpb=2cd537461ee17af9514b5be480c875e947c415a9;p=sbcl.git diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp index c1deb5a..4b9e766 100644 --- a/src/code/target-pathname.lisp +++ b/src/code/target-pathname.lisp @@ -267,19 +267,20 @@ (defun pathname= (pathname1 pathname2) (declare (type pathname pathname1) (type pathname pathname2)) - (and (eq (%pathname-host pathname1) - (%pathname-host pathname2)) - (compare-component (%pathname-device pathname1) - (%pathname-device pathname2)) - (compare-component (%pathname-directory pathname1) - (%pathname-directory pathname2)) - (compare-component (%pathname-name pathname1) - (%pathname-name pathname2)) - (compare-component (%pathname-type pathname1) - (%pathname-type pathname2)) - (or (eq (%pathname-host pathname1) *unix-host*) - (compare-component (%pathname-version pathname1) - (%pathname-version pathname2))))) + (or (eq pathname1 pathname2) + (and (eq (%pathname-host pathname1) + (%pathname-host pathname2)) + (compare-component (%pathname-device pathname1) + (%pathname-device pathname2)) + (compare-component (%pathname-directory pathname1) + (%pathname-directory pathname2)) + (compare-component (%pathname-name pathname1) + (%pathname-name pathname2)) + (compare-component (%pathname-type pathname1) + (%pathname-type pathname2)) + (or (eq (%pathname-host pathname1) *unix-host*) + (compare-component (%pathname-version pathname1) + (%pathname-version pathname2)))))) ;;; Convert PATHNAME-DESIGNATOR (a pathname, or string, or ;;; stream), into a pathname in pathname.