Changeset 11756


Ignore:
Timestamp:
Feb 22, 2009, 10:54:07 AM (10 years ago)
Author:
gb
Message:

Try to ensure that the third value returned by FIND-LOAD-FILE - which is
sometimes used to set CCL:*LOADING-FILE-SOURCE-FILE*, which some old
MCL code may reference - is an absolute pathname.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-1/l1-files.lisp

    r11738 r11756  
    491491
    492492(defun %path-from-stream (stream)
    493   (or (pathname (stream-filename stream)) (error "Can't determine pathname of ~S ." stream)))      ; ???
     493  (or (pathname (stream-filename stream))
     494      (error "Can't determine pathname of ~S ." stream)))      ; ???
    494495
    495496;Like (pathname stream) except returns NIL rather than error when there's no
     
    11511152      (let ((file-type (pathname-type full-name)))
    11521153        (if (and file-type (neq file-type :unspecific))
    1153           (values (probe-file full-name) file-name file-name)
     1154          (values (probe-file full-name) file-name (if (eq (pathname-host file-name) :unspecific) full-name file-name))
    11541155          (let* ((source (merge-pathnames file-name *.lisp-pathname*))
    11551156                 (fasl   (merge-pathnames file-name *.fasl-pathname*))
     
    11571158                 (true-fasl   (probe-file fasl)))
    11581159            (cond (true-source
     1160                   (when (eq (pathname-host file-name) :unspecific) ;; if physical pathname to begin with, force absolute
     1161                     (setq source full-name))
    11591162                   (if (and true-fasl
    11601163                            (> (file-write-date true-fasl)
Note: See TracChangeset for help on using the changeset viewer.