Merge branch 'master' of metalzone:public-git/lisp

[lisp] / safely.lisp

diff --git a/safely.lisp b/safely.lisp
index 2477f9a721b7350fb997e31d97937a30b43d39af..84a06c4a6cd65649c745410327c9e388d24c761f 100644 (file)
--- a/safely.lisp
+++ b/safely.lisp
@@ -33,7 +33,13 @@ (in-package #:safely)
 #+(or cmu sbcl)
 (eval-when (:compile-toplevel :execute)
   (import #+cmu '(ext:unix-namestring unix:unix-link)
 #+(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."
 
 (defstruct (safely (:predicate safelyp))
   "Stores information about how to commit or undo safe writes."


@@ -104,6 +110,11 @@ (defun safely-open-output-stream (safe file &rest open-args)
          (safely-trail safe))
     stream))
 
          (safely-trail safe))
     stream))
 

+(declaim (inline rename))
+(defun rename (old new)
+  #-clisp (rename-file old new)
+  #+clisp (posix:copy-file old new :method :rename))
+

 (defun delete-file-without-moaning (file)
   "Delete the FILE, ignoring errors."
   (handler-case (delete-file file)
 (defun delete-file-without-moaning (file)
   "Delete the FILE, ignoring errors."
   (handler-case (delete-file file)


@@ -112,7 +123,7 @@ (defun delete-file-without-moaning (file)
 (defun rename-file-without-moaning (old new)
   "Rename OLD to NEW, ignoring errors, and without doing any stupid name
    mangling."
 (defun rename-file-without-moaning (old new)
   "Rename OLD to NEW, ignoring errors, and without doing any stupid name
    mangling."

-  (handler-case (rename-file old new)
+  (handler-case (rename old new)

     (file-error () nil)))
 
 (defun safely-unwind (trail)
     (file-error () nil)))
 
 (defun safely-unwind (trail)


@@ -153,11 +164,23 @@ (defun safe-copy (file tag)
   ;; Use link(2) where available.
   (generate-fresh-file-name file tag
                            (lambda (name)
   ;; 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)))))
 
                                (and from to
                                     (unix-link from to)))))
 

+  #+clisp
+  (generate-fresh-file-name file tag
+                           (lambda (name)
+                             (posix:copy-file (namestring file)
+                                              (namestring name)
+                                              :method :hardlink
+                                              :if-exists nil)))
+
+
+

   #-(or cmu sbcl)
   ;; Otherwise just copy the file contents and hope for the best.
   (with-open-file (input file :element-type :default)
   #-(or cmu sbcl)
   ;; Otherwise just copy the file contents and hope for the best.
   (with-open-file (input file :element-type :default)


@@ -207,7 +230,7 @@ (defun safely-commit (safe)
                                  (push `(:rmtmp ,old) cleanup)
                                  (push `(:revert ,old ,file) revert))
                                (push `(:rmtmp ,file) revert))
                                  (push `(:rmtmp ,old) cleanup)
                                  (push `(:revert ,old ,file) revert))
                                (push `(:rmtmp ,file) revert))

-                           (rename-file new file)))
+                           (rename new file)))

                  (:delete (destructuring-bind (tag file) job
                             (declare (ignore tag))
                             (let ((old (safe-copy file "delete")))
                  (:delete (destructuring-bind (tag file) job
                             (declare (ignore tag))
                             (let ((old (safe-copy file "delete")))