0.9.17.13: SB-POSIX:CFSET*SPEED, SB-POSIX:CFGET*SPEED, and related constants

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

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index 2e0d4bf..02855f8 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)
@@ -44,7 +18,8 @@
   ((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)