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 56829a0155d6a287c6e21f6c769854070c12a138..af860c4c5947cdb2d2fe551d93b5654dcfe8d372 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          libraries.cl
+;;;; Name:          libraries.lisp
 ;;;; Purpose:       UFFI source to load foreign libraries
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.6 2002/11/20 21:01:31 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
 
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
@@ -29,12 +28,19 @@
   #-(or win32 mswindows macosx darwin ccl-5.0) "so"
 )
 
+(defun foreign-library-types ()
+  "Returns list of string naming possible library types for platform, sorted by preference"
+  #+(or win32 mswindows) '("dll" "lib")
+  #+(or macosx darwin ccl-5.0) '("dylib" "bundle")
+  #-(or win32 mswindows macosx darwin ccl-5.0) '("so" "a" "o")
+)
+
 (defun find-foreign-library (names directories &key types drive-letters)  
   "Looks for a foreign library. directories can be a single
 string or a list of strings of candidate directories. Use default
 library type if type is not specified."
   (unless types
-    (setq types (default-foreign-library-type)))
+    (setq types (foreign-library-types)))
   (unless (listp types)
     (setq types (list types)))
   (unless (listp names)
@@ -73,25 +79,31 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                           force-load)
-  #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
+  #+(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
       (progn
        #+cmu
        (let ((type (pathname-type (parse-namestring filename))))
-         (if (equal type "so")
+         (if (string-equal type "so")
              (sys::load-object-file filename)
-           (alien:load-foreign filename 
-                               :libraries
-                               (convert-supporting-libraries-to-string
-                                supporting-libraries))))
+             (alien:load-foreign filename 
+                                 :libraries
+                                 (convert-supporting-libraries-to-string
+                                  supporting-libraries))))
        #+scl
        (let ((type (pathname-type (parse-namestring filename))))
          (alien:load-foreign filename 
@@ -99,11 +111,14 @@ library type if type is not specified."
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
        #+sbcl
-       (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)