safely.lisp: Fixes for later SBCL.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 31 May 2011 12:12:04 +0000 (13:12 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 31 May 2011 12:12:04 +0000 (13:12 +0100)
SBCL killed UNIX-NAMESTRING, so we'd better use NATIVE-NAMESTRING.
We fake up an implementation of NATIVE-NAMESTRING for CMUCL.

safely.lisp

index 2477f9a..4830a99 100644 (file)
 #+(or cmu sbcl)
 (eval-when (:compile-toplevel :execute)
   (import #+cmu '(ext:unix-namestring unix:unix-link)
-         #+sbcl '(sb-int:unix-namestring)))
+         #+sbcl '(sb-ext:native-namestring)))
+#+cmu
+(progn
+  (declaim (inline unix-namestring))
+  (defun native-namestring (pathname &key as-file)
+    (declare (ignore as-file))
+    (unix-namestring pathname nil)))
 
 (defstruct (safely (:predicate safelyp))
   "Stores information about how to commit or undo safe writes."
   ;; Use link(2) where available.
   (generate-fresh-file-name file tag
                            (lambda (name)
-                             (let ((from (unix-namestring file t))
-                                   (to (unix-namestring name nil)))
+                             (let ((from (native-namestring file
+                                                            :as-file t))
+                                   (to (native-namestring name
+                                                          :as-file t)))
                                (and from to
                                     (unix-link from to)))))