r10571: avoid multiple evaluation for strings input to macros

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 8fa6612477f727c40ee4afb924d682ff0892a74f..af860c4c5947cdb2d2fe551d93b5654dcfe8d372 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -81,11 +81,17 @@ library type if type is not specified."
                                           force-load)
   #+(or allegro mcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl sbcl) (declare (ignore module))
-  
-  (when (and filename (probe-file filename))
-    (if (pathnamep filename)    ;; ensure filename is a string to check if
-       (setq filename (namestring filename)))  ; already loaded
+  #+lispworks (declare (ignore supporting-libraries))
 
+  (when (and filename (or (null (pathname-directory filename))
+                          (probe-file filename)))
+    (if (pathnamep filename)    ;; ensure filename is a string to check if already loaded
+       (setq filename (namestring (if (null (pathname-directory filename))
+                                      filename 
+                                      ;; lispworks treats as UNC, so use truename
+                                      #+(and lispworks win32 mswindows) (truename filename)
+                                      #-(and lispworks win32 mswindows) filename))))
+    
     (if (and (not force-load)
             (find filename *loaded-libraries* :test #'string-equal))
        t ;; return T, but don't reload library
@@ -105,16 +111,14 @@ library type if type is not specified."
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
        #+sbcl
-       (let ((type (pathname-type (parse-namestring filename))))
-         (if (or (string-equal type "so")
-                 (string-equal type "bundle")
-                 (string-equal type "dylib"))
-             (sb-alien::load-1-foreign filename)
-             (sb-alien:load-foreign filename 
-                                    :libraries
-                                    (convert-supporting-libraries-to-string
-                                     supporting-libraries))))
-       #+lispworks (fli:register-module module :real-name filename)
+       (handler-case (sb-alien::load-1-foreign filename)
+         (sb-int:unsupported-operator (c)
+           (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien))
+               (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
+               (error c))))
+
+       #+lispworks (fli:register-module module :real-name filename
+                                                :connection-style :immediate)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)
        #+(and mcl (not openmcl)) (ccl:add-to-shared-library-search-path filename t)