X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fsb-posix%2Fmacros.lisp;h=2e0d4bf09c7d4850307602b012bceaa1f91c0648;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=4cff10c0c99e4247aae84ec37fc1f704a40575fe;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp index 4cff10c..2e0d4bf 100644 --- a/contrib/sb-posix/macros.lisp +++ b/contrib/sb-posix/macros.lisp @@ -1,33 +1,33 @@ (in-package :sb-posix-internal) -;;; some explanation may be necessary. The namestring "[foo]" +;;; 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))) + (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)))))) + (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) + (null) (string (write-string name s))) (etypecase type - (null) - (string (write-char #\. s) (write-string type s)))))) + (null) + (string (write-char #\. s) (write-string type s)))))) (define-designator filename c-string - (pathname + (pathname (native-filename (translate-logical-pathname filename))) (string filename)) @@ -47,31 +47,31 @@ (intern (substitute #\- #\_ (string-upcase s)) :sb-posix)) (defmacro define-call-internally (lisp-name c-name return-type error-predicate - &rest arguments) + &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) @@ -79,10 +79,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))) @@ -90,4 +90,4 @@ (export ',lisp-name :sb-posix) (declaim (inline ,lisp-name)) (defun ,lisp-name ,arglist - ,@body)))) + ,@body))))