1.0.1.1:

[sbcl.git] / contrib / sb-posix / macros.lisp

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index 2399c98..dd22a7c 100644 (file)
--- a/contrib/sb-posix/macros.lisp
+++ b/contrib/sb-posix/macros.lisp
@@ -1,4 +1,4 @@
-(in-package :sb-posix-internal)
+(in-package :sb-posix)
 
 (define-designator filename c-string
   (pathname
@@ -17,8 +17,28 @@
   (null (sb-alien:sap-alien (sb-sys:int-sap 0) (* t)))
   ((alien (* t)) alien-pointer-to-anything-or-nil))
 
-(defun lisp-for-c-symbol (s)
-  (intern (substitute #\- #\_ (string-upcase s)) :sb-posix))
+(defun lisp-for-c-symbol (name)
+  (etypecase name
+    (list
+     (lisp-for-c-symbol (car name)))
+    (string
+     (let ((root (if (eql #\_ (char name 0)) (subseq name 1) name)))
+       (intern (substitute #\- #\_ (string-upcase root)) :sb-posix)))))
+
+(defun real-c-name (name)
+  (etypecase name
+    (list
+     (destructuring-bind (name &key c-name options) name
+       (if c-name
+           c-name
+           (cond #+largefile
+                 ((or (eql options :largefile)
+                      (member :largefile options))
+                  (format nil "~a_largefile" name))
+                 (t
+                  name)))))
+    (string
+     name)))
 
 (defmacro define-call-internally (lisp-name c-name return-type error-predicate
                                   &rest arguments)
@@ -49,11 +69,12 @@
       `(sb-int:style-warn "Didn't find definition for ~S" ,c-name)))
 
 (defmacro define-call (name return-type error-predicate &rest arguments)
-  (let ((lisp-name (lisp-for-c-symbol name)))
+  (let ((lisp-name (lisp-for-c-symbol name))
+        (real-c-name (real-c-name name)))
     `(progn
        (export ',lisp-name :sb-posix)
        (define-call-internally ,lisp-name
-           ,name
+           ,real-c-name
          ,return-type
          ,error-predicate
          ,@arguments))))