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 2e0d4bf..dd22a7c 100644 (file)
--- 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)))
+   (sb-ext:native-namestring (translate-logical-pathname filename)))
   (string filename))
 
 (define-designator file-descriptor (integer 32)
@@ -43,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)
@@ -75,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))))