X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fmacros.lisp;h=f80e714c419c9656e5ad5eeffe209773e481b6f1;hb=f7e3e709f7c2207f1923375942f7fb1c092f92b0;hp=02855f8dfe4562fd4dd69a92f8f5ec3005b88c54;hpb=3eb0a28fe6a7912d6ff2b97221325c0e3bfc5703;p=sbcl.git diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp index 02855f8..f80e714 100644 --- a/contrib/sb-posix/macros.lisp +++ b/contrib/sb-posix/macros.lisp @@ -2,7 +2,8 @@ (define-designator filename c-string (pathname - (sb-ext:native-namestring (translate-logical-pathname filename))) + (sb-ext:native-namestring (translate-logical-pathname filename) + :as-file t)) (string filename)) (define-designator file-descriptor (integer 32) @@ -17,9 +18,38 @@ (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) - (let ((root (if (eql #\_ (char s 0)) (subseq s 1) s))) - (intern (substitute #\- #\_ (string-upcase root)) :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))))) + +;; Note: this variable is set in interface.lisp. defined here for +;; clarity and so the real-c-name compile as desired. +(defparameter *c-functions-in-runtime* nil) + +(defun real-c-name (name) + (let ((maybe-name + (etypecase name + (list + (destructuring-bind (name &key c-name options) name + (declare (ignorable options)) + (if c-name + c-name + (cond #+largefile + ((or (eql options :largefile) + (member :largefile options)) + (format nil "~a_largefile" name)) + (t + name))))) + (string + name)))) + (if (member maybe-name *c-functions-in-runtime* + :test #'string=) + (format nil "_~A" maybe-name) + maybe-name))) (defmacro define-call-internally (lisp-name c-name return-type error-predicate &rest arguments) @@ -50,11 +80,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))))