Changeset 10032


Ignore:
Timestamp:
Jul 15, 2008, 1:21:57 PM (11 years ago)
Author:
gb
Message:

CCL-DIRECTORY: if initialized from heap image, use pathname-device, too.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/win64/level-1/l1-pathnames.lisp

    r9818 r10032  
    348348            (f-version (pathname-version from-wildname))
    349349            (t-version (pathname-version to-wildname)))
    350         (if (not (%component-match-p s-version f-version))(translate-pathname-component-mismatch 'pathname-version source from-wildname))
     350        (if (not (%component-match-p s-version f-version)) (translate-pathname-component-mismatch 'pathname-version source from-wildname))
    351351        (setq r-version (translate-component s-version f-version t-version reversible))
    352352        ;(if (eq r-version :unspecific)(setq r-version nil))
     
    637637    (if dirpath
    638638      (native-to-directory-pathname dirpath)
    639       (let* ((directory-containing-heap-image
    640               (make-pathname :directory (pathname-directory (%realpath (heap-image-name)))))
    641              (rpath (merge-pathnames
    642                      #+darwin-target "../Resources/ccl/"
    643                      #-darwin-target "Resources/ccl/"
    644                      directory-containing-heap-image)))
    645         (or (probe-file rpath)
    646             directory-containing-heap-image)))))
     639      (let* ((heap-image-path (%realpath (heap-image-name)))
     640              (directory-containing-heap-image
     641               (make-pathname :directory (pathname-directory heap-image-path )
     642                              :device (pathname-device heap-image-path))))
     643        (or directory-containing-heap-image)))))
    647644
    648645
Note: See TracChangeset for help on using the changeset viewer.