0.8.7.52:

[sbcl.git] / src / code / module.lisp

diff --git a/src/code/module.lisp b/src/code/module.lisp
index 9b2903e..c9f1861 100644 (file)
--- a/src/code/module.lisp
+++ b/src/code/module.lisp
@@ -22,7 +22,7 @@
   "This is a list of module names that have been loaded into Lisp so far.
    It is used by PROVIDE and REQUIRE.")
 
-(defvar sb!ext::*MODULE-PROVIDER-FUNCTIONS* '(module-provide-contrib)
+(defvar *module-provider-functions* '(module-provide-contrib)
   "See function documentation for REQUIRE")
 
 \f
@@ -54,7 +54,7 @@
               (load ele)))
            (t
             (unless (some (lambda (p) (funcall p module-name))
-                          sb!ext::*module-provider-functions*)
+                          *module-provider-functions*)
               (error "Don't know how to load ~A" module-name)))))
     (set-difference *modules* saved-modules)))
 \f
@@ -63,11 +63,23 @@
 (defun module-provide-contrib (name)
   "Stringify and downcase NAME, then attempt to load the file
    $SBCL_HOME/name/name"
-  (let ((filesys-name (string-downcase (string name))))
-    (load
-     (merge-pathnames (make-pathname :directory (list :relative filesys-name)
-                                    :name filesys-name :type nil)
-                     (truename (posix-getenv "SBCL_HOME")))))
-  t)
-
-
+  (let* ((filesys-name (string-downcase (string name)))
+        (unadorned-path
+         (merge-pathnames
+          (make-pathname :directory (list :relative filesys-name)
+                         :name filesys-name)
+          (truename (posix-getenv "SBCL_HOME"))))
+        (fasl-path (merge-pathnames
+                    (make-pathname :type *fasl-file-type*)
+                    unadorned-path))
+        (lisp-path (merge-pathnames (make-pathname :type "lisp")
+                                    unadorned-path)))
+    ;; KLUDGE: there's a race condition here; the file we probe could
+    ;; be removed by the time we get round to trying to load it.
+    ;; Maybe factor out the logic in the LOAD guesser as to which file
+    ;; was meant, so that we can use it here on open streams instead?
+    (when (or (probe-file unadorned-path)
+             (probe-file fasl-path)
+             (probe-file lisp-path))
+      (load unadorned-path)
+      t)))