X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fmacros.lisp;h=02855f8dfe4562fd4dd69a92f8f5ec3005b88c54;hb=c9b36f04557bd6c7208863e73bae7b1bc6e64842;hp=cd722e3339a95b2e66dabd7c50b5627f6d1ae462;hpb=ccc4a55f3f70219a45b0038d8442615e5abff494;p=sbcl.git

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index cd722e3..02855f8 100644
--- a/contrib/sb-posix/macros.lisp
+++ b/contrib/sb-posix/macros.lisp
@@ -1,34 +1,8 @@
-(in-package :sb-posix-internal)
-
-;;; some explanation may be necessary.  The namestring "[foo]" 
-;;; denotes a wild pathname.  When there's a file on the disk whose
-;;; Unix name is "[foo]", the appropriate CL namestring for it is
-;;; "\\[foo]".  So, don't call NAMESTRING, instead call a function
-;;; that gets us the Unix name
-(defun native-filename (pathname)
-  (let ((directory (pathname-directory pathname))
-	(name (pathname-name pathname))
-	(type (pathname-type pathname)))
-    (with-output-to-string (s nil :element-type 'base-char)
-      (etypecase directory
-	(string (write-string directory s))
-	(list
-	 (when (eq (car directory) :absolute)
-	   (write-char #\/ s))
-	 (dolist (piece (cdr directory))
-	   (etypecase piece
-	     (string (write-string piece s) (write-char #\/ s))
-	     ((member :up) (write-string "../" s))))))
-      (etypecase name
-	(null)
-        (string (write-string name s)))
-      (etypecase type
-	(null)
-	(string (write-char #\. s) (write-string type s))))))
+(in-package :sb-posix)
 
 (define-designator filename c-string
-  (pathname 
-   (native-filename (translate-logical-pathname filename)))
+  (pathname
+   (sb-ext:native-namestring (translate-logical-pathname filename)))
   (string filename))
 
 (define-designator file-descriptor (integer 32)
@@ -44,35 +18,35 @@
   ((alien (* t)) alien-pointer-to-anything-or-nil))
 
 (defun lisp-for-c-symbol (s)
-  (intern (substitute #\- #\_ (string-upcase s)) :sb-posix))
+  (let ((root (if (eql #\_ (char s 0)) (subseq s 1) s)))
+    (intern (substitute #\- #\_ (string-upcase root)) :sb-posix)))
 
 (defmacro define-call-internally (lisp-name c-name return-type error-predicate
-				  &rest arguments)
-  (if (sb-sys:foreign-symbol-address-as-integer-or-nil
-       (sb-vm:extern-alien-name c-name))
+                                  &rest arguments)
+  (if (sb-sys:find-foreign-symbol-address c-name)
       `(progn
-	(declaim (inline ,lisp-name))
-	(defun ,lisp-name ,(mapcar #'car arguments)
-	  (let ((r (alien-funcall
-		    (extern-alien
-		     ,c-name
-		     (function ,return-type
-			       ,@(mapcar
-				  (lambda (x)
-				    (gethash (cadr x)
-					     *designator-types*
-					     (cadr x)))
-				  arguments)))
-		    ,@(mapcar (lambda (x)
-				(if (nth-value 1
-					       (gethash (cadr x)
-							*designator-types*))
-				    `(,(intern (symbol-name (cadr x))
-					       :sb-posix)
-				      ,(car x))
-				    (car x)))
-			      arguments))))
-	    (if (,error-predicate r) (syscall-error) r))))
+        (declaim (inline ,lisp-name))
+        (defun ,lisp-name ,(mapcar #'car arguments)
+          (let ((r (alien-funcall
+                    (extern-alien
+                     ,c-name
+                     (function ,return-type
+                               ,@(mapcar
+                                  (lambda (x)
+                                    (gethash (cadr x)
+                                             *designator-types*
+                                             (cadr x)))
+                                  arguments)))
+                    ,@(mapcar (lambda (x)
+                                (if (nth-value 1
+                                               (gethash (cadr x)
+                                                        *designator-types*))
+                                    `(,(intern (symbol-name (cadr x))
+                                               :sb-posix)
+                                      ,(car x))
+                                    (car x)))
+                              arguments))))
+            (if (,error-predicate r) (syscall-error) r))))
       `(sb-int:style-warn "Didn't find definition for ~S" ,c-name)))
 
 (defmacro define-call (name return-type error-predicate &rest arguments)
@@ -80,10 +54,10 @@
     `(progn
        (export ',lisp-name :sb-posix)
        (define-call-internally ,lisp-name
-	   ,name
-	 ,return-type
-	 ,error-predicate
-	 ,@arguments))))
+           ,name
+         ,return-type
+         ,error-predicate
+         ,@arguments))))
 
 (defmacro define-entry-point (name arglist &body body)
   (let ((lisp-name (lisp-for-c-symbol name)))
@@ -91,4 +65,4 @@
       (export ',lisp-name :sb-posix)
       (declaim (inline ,lisp-name))
       (defun ,lisp-name ,arglist
-	,@body))))
+        ,@body))))