X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-pathname.lisp;h=6f8f1a0c2fff67dcc8f7ad82409bf981dd503f59;hb=7e24349c17298e2959e853ea411b5f65d9f7f332;hp=eee1e6a5f038ddbe1b3531109b6c4028096dd83b;hpb=fb8e5ded0b56f50de2024efbcc9ce68b401415f5;p=sbcl.git diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp index eee1e6a..6f8f1a0 100644 --- a/src/code/target-pathname.lisp +++ b/src/code/target-pathname.lisp @@ -858,7 +858,7 @@ a host-structure or string." (let* ((end (%check-vector-sequence-bounds namestr start end))) (multiple-value-bind (new-host device directory file type version) (cond - (host + (host (funcall (host-parse-native host) namestr start end)) ((pathname-host defaults) (funcall (host-parse-native (pathname-host defaults)) @@ -1270,8 +1270,9 @@ PARSE-NAMESTRING." (frob %pathname-name) (frob %pathname-type) (if (eq from-host *unix-host*) - (if (eq (%pathname-version to) :wild) - (%pathname-version from) + (if (or (eq (%pathname-version to) :wild) + (eq (%pathname-version to) nil)) + (%pathname-version source) (%pathname-version to)) (frob %pathname-version)))))))))