X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=87d8939f7030acfe774c03e9ed47e50fb1f726b2;hb=98a76d4426660876dec6649b1e228d2e5b47f579;hp=96b0cde0827ee74353e5338e03eead031bbe2af9;hpb=e33fb894f991b2926d8f3bace9058e4c0b2c3a37;p=sbcl.git

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index 96b0cde..87d8939 100644
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -10,20 +10,29 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB-SYS") ; (SB-SYS, not SB!SYS, since we're built in warm load.)
+(in-package "SB-ALIEN") ; (SB-ALIEN, not SB!ALIEN, since we're in warm load.)
+
+;;; SEMI-KLUDGE: Preferable would be to use something like O_NOFOLLOW
+;;; which will refuse to open() a file if it is a symlink; but I've
+;;; been told that is a FreeBSD/Linux-only thing.  Meanwhile, this will
+;;; make our filenames a lot less predictable.
+;;; (The man file for open() says O_EXCL should treat even a symlink as
+;;; an existing file.  I wonder if it really does that.)
+;;; Also, no more dependence on ASCII character ordering.
+;;; -- mrd 20021101
+(defun generate-random-string (&optional (len 6))
+  (let* ((characters "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+	 (num (length characters))
+	 (string (make-string len)))
+    (dotimes (i len string)
+      (setf (char string i)
+	    (char characters (random num))))))
 
 (defun pick-temporary-file-name (&optional
-				 ;; KLUDGE: There are various security
-				 ;; nastyisms associated with easily
-				 ;; guessable temporary file names,
-				 ;; and we haven't done anything to
-				 ;; work around them here. -- pointed
-				 ;; out by Dan Barlow on sbcl-devel
-				 ;; 20000702
-				 (base "/tmp/sbcl-tmp-~D~C"))
-  (let ((code (char-code #\A)))
+				 (base "/tmp/sbcl-tmp-~D~A"))
+  (let ((code (generate-random-string)))
     (loop
-      (let ((name (format nil base (sb-unix:unix-getpid) (code-char code))))
+      (let ((name (format nil base (sb-unix:unix-getpid) code)))
 	(multiple-value-bind (fd errno)
 	    (sb-unix:unix-open name
 			       (logior sb-unix:o_wronly
@@ -37,14 +46,8 @@
 		 (simple-file-perror "couldn't create temporary file ~S"
 				     name
 				     errno))
-		;; KLUDGE: depends on ASCII character ordering -- WHN 20000128
-		((= code (char-code #\Z))
-		 (setf code (char-code #\a)))
-		((= code (char-code #\z))
-		 (return nil))
 		(t
-		 (incf code))))))))
-
+		 (setf code (generate-random-string)))))))))
 
 ;;; On any OS where we don't support foreign object file loading, any
 ;;; query of a foreign symbol value is answered with "no definition
@@ -54,7 +57,7 @@
 ;;; placeholder implementation is overwritten by a subsequent real
 ;;; implementation.)
 ;;;
-;;; You may want to use sb-sys:foreign-symbol-address instead of
+;;; You may want to use SB-SYS:FOREIGN-SYMBOL-ADDRESS instead of
 ;;; calling this directly; see code/target-load.lisp.
 (defun get-dynamic-foreign-symbol-address (symbol)
   (declare (type simple-string symbol) (ignore symbol))
@@ -63,7 +66,17 @@
 ;;; dlsym()-based implementation of GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS
 ;;; and functions (e.g. LOAD-FOREIGN) which affect it.  This should 
 ;;; work on any ELF system with dlopen(3) and dlsym(3)
-#+(or linux FreeBSD)
+;;; It also works on OpenBSD, which isn't ELF, but is otherwise modern
+;;; enough to have a fairly well working dlopen/dlsym implementation.
+#-(or linux sunos FreeBSD OpenBSD)
+(macrolet ((define-unsupported-fun (fun-name)
+	     `(defun ,fun-name (&rest rest)
+		"unsupported on this system"
+                (declare (ignore rest))
+		(error 'unsupported-operator :name ',fun-name))))
+  (define-unsupported-fun load-1-foreign)
+  (define-unsupported-fun load-foreign))
+#+(or linux sunos FreeBSD OpenBSD)
 (progn
 
 ;;; flags for dlopen()
@@ -105,29 +118,27 @@
       *after-save-initializations*)
 
 (defvar *dso-linker* "/usr/bin/ld")
-(defvar *dso-linker-options* '("-G" "-o"))
-
+(defvar *dso-linker-options* '("-shared" "-o"))
 
 (sb-alien:define-alien-routine dlopen system-area-pointer
-  (file sb-c-call:c-string) (mode sb-c-call:int))
+  (file sb-alien:c-string) (mode sb-alien:int))
 (sb-alien:define-alien-routine dlsym system-area-pointer
   (lib system-area-pointer)
-  (name sb-c-call:c-string))
-(sb-alien:define-alien-routine dlerror sb-c-call:c-string)
+  (name sb-alien:c-string))
+(sb-alien:define-alien-routine dlerror sb-alien:c-string)
 
 ;;; Ensure that we've opened our own binary so we can dynamically resolve 
 ;;; symbols in the C runtime.  
-
+;;;
 ;;; Old comment: This used to happen only in
 ;;; GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS, and only if no libraries were
 ;;; dlopen()ed already, but that didn't work if something was
 ;;; dlopen()ed before any problem global vars were used.  So now we do
 ;;; this in any function that can add to the *HANDLES-FROM-DLOPEN*, as
 ;;; well as in GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS.
-
+;;;
 ;;; FIXME: It would work just as well to do it once at startup, actually.
 ;;; Then at least we know it's done.    -dan 2001.05.10
-
 (defun ensure-runtime-symbol-table-opened ()
   (unless *handles-from-dlopen*
     ;; Prevent recursive call if dlopen() isn't defined.
@@ -216,7 +227,7 @@
   (when (and env-p environment-p)
     (error "can't specify :ENV and :ENVIRONMENT simultaneously"))
   (let ((output-file (pick-temporary-file-name
-		      (concatenate 'string "/tmp/~D~C" (string (gensym)))))
+		      (concatenate 'string "/tmp/~D~A" (string (gensym)))))
 	(error-output (make-string-output-stream)))
 
     (/show "running" *dso-linker*)