safely.lisp: More CLisp fixing.

[lisp] / safely.lisp

diff --git a/safely.lisp b/safely.lisp
index 44a707e..9e723ed 100644 (file)
--- a/safely.lisp
+++ b/safely.lisp
@@ -13,12 +13,12 @@
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 2 of the License, or
 ;;; (at your option) any later version.
-;;; 
+;;;
 ;;; This program is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
-;;; 
+;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software Foundation,
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -30,6 +30,11 @@
           #:safely-writing))
 (in-package #:safely)
 
+#+(or cmu sbcl)
+(eval-when (:compile-toplevel :execute)
+  (import #+cmu '(ext:unix-namestring unix:unix-link)
+         #+sbcl '(sb-int:unix-namestring)))
+
 (defstruct (safely (:predicate safelyp))
   "Stores information about how to commit or undo safe writes."
   (streams nil)
@@ -99,6 +104,11 @@
          (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)
@@ -107,7 +117,7 @@
 (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)
@@ -136,19 +146,34 @@
   (safely-unwind (safely-trail safe))
   (safely-reset safe))
 
+#+sbcl
+(defun unix-link (from to)
+  (sb-unix::int-syscall ("link" sb-alien:c-string sb-alien:c-string)
+                       from to))
+
 (defun safe-copy (file tag)
   "Make a copy of the FILE.  Return the new name."
 
-  #+cmu
+  #+(or cmu sbcl)
   ;; Use link(2) where available.
   (generate-fresh-file-name file tag
                            (lambda (name)
-                             (let ((from (ext:unix-namestring file t))
-                                   (to (ext:unix-namestring name nil)))
+                             (let ((from (unix-namestring file t))
+                                   (to (unix-namestring name nil)))
                                (and from to
-                                    (unix:unix-link from to)))))
+                                    (unix-link from to)))))
 
-  #-cmu
+  #+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)
     (multiple-value-bind
@@ -171,7 +196,7 @@
                   (when (< read (length buffer))
                     (return copy))))))
        (close output)))))
-                                             
+
 (defun safely-commit (safe)
   "Commit SAFE.  The files deleted by safely-delete-file are deleted; the
    files created by safely-open-output-stream are renamed over the old
@@ -197,7 +222,7 @@
                                  (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")))
@@ -227,8 +252,7 @@
    temporary file, and if BODY completes, it is renamed to FILE."
   (with-gensyms safe
     `(safely (,safe)
-       (let ((,stream (apply #'safely-open-output-stream
-                            ,safe ,file ,open-args)))
+       (let ((,stream (safely-open-output-stream ,safe ,file ,@open-args)))
         ,@body))))
 
 ;;;----- That's all, folks --------------------------------------------------